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 'b28f4032f887486a5252a319a5c5daf012a13592':
main
Satoshi Kataoka 2013-09-26 06:55:50 -07:00 committed by Android Git Automerger
commit 9a1be285a4

Diff Content Not Available