am 3de6e07c: am 9a1be285: am b28f4032: am ec2f54e9: am fbe55eae: am 7fdd3431: am 873f9b90: am 6435c800: Merge "Fix an issue on the transition between the setup and the settings"

* commit '3de6e07c39f816b012caa49fa5e48885d2b54b0a':
main
Satoshi Kataoka 2013-10-03 14:43:40 -07:00 committed by Android Git Automerger
commit 81e6447b62

Diff Content Not Available