am 42b7bad5: am 114e9c56: am 0eb45d7f: am 484e9144: am e29ffdb6: am c14fdded: am 714b0044: am 2cd99981: am ed66b232: am cffac321: am 873c20ba: am e40d5633: am 43341ba0: Merge "Ask the client to make itself known when it\'s not"

* commit '42b7bad5b62d035eadc0397eaccb891ed9b54686':
main
Jean Chalard 2013-05-15 10:59:52 -07:00 committed by Android Git Automerger
commit bc599f8ad6

Diff Content Not Available