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 '20599a75c1e689f7866dcbc3094f7cfb073cd516':
main
Satoshi Kataoka 2013-10-09 18:12:51 -07:00 committed by Android Git Automerger
commit 2a22ab1959

Diff Content Not Available