OSDN Git Service

am 7b449db2: am b14698ee: Merge "Finished the location settings"
authorLifu Tang <lifu@google.com>
Thu, 5 Dec 2013 19:21:28 +0000 (19:21 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 5 Dec 2013 19:21:28 +0000 (19:21 +0000)
* commit '7b449db21ecae05f95355544936bd840a89601c7':


Trivial merge