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 '9a1be285a40ffb8ad6b760b0690e7056e965f062':
main
Satoshi Kataoka 2013-10-03 11:27:00 -07:00 committed by Android Git Automerger
commit 3de6e07c39

Diff Content Not Available