OSDN Git Service

am fb2b5cd9: (-s ours) am 098061c2: am 88afb32f: Displays a list of most recent locat...
authorLifu Tang <lifu@google.com>
Thu, 5 Dec 2013 22:45:13 +0000 (22:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 5 Dec 2013 22:45:13 +0000 (22:45 +0000)
* commit 'fb2b5cd951be02e8694d23b9dd9a832cd83bd960':


Trivial merge