am 7fdd3431: am 873f9b90: am 6435c800: Merge "Fix an issue on the transition between the setup and the settings"

* commit '7fdd34317d863db6516a28126b70d2f9c74d7da0':
This commit is contained in:
Satoshi Kataoka 2013-05-15 12:50:22 -07:00 committed by Android Git Automerger
commit fbe55eae94

Diff content is not available