OSDN Git Service

am cd412600: (-s ours) am 7b449db2: am b14698ee: Merge "Finished the location settings"
authorLifu Tang <lifu@google.com>
Thu, 5 Dec 2013 22:45:12 +0000 (22:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 5 Dec 2013 22:45:12 +0000 (22:45 +0000)
* commit 'cd4126005dd7ef8808171c07df07ebb149170d1e':


Trivial merge