am 2a22ab19: am 20599a75: am 89f7f9e3: am 81e6447b: 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 '2a22ab19594429dc5db2df8af0c7a3a9b6c9af73':
main
Satoshi Kataoka 2013-10-09 19:51:10 -07:00 committed by Android Git Automerger
commit 610428b778

Diff Content Not Available