OSDN Git Service

am ed8cf649: am 5ddefc17: (-s ours) am a5e25f33: Merge "Added ACCESS_COARSE_LOCATION...
authorFyodor Kupolov <fkupolov@google.com>
Thu, 27 Aug 2015 18:29:15 +0000 (18:29 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 18:29:15 +0000 (18:29 +0000)
* commit 'ed8cf64962332b128f8e230367cdc817620170f8':


Trivial merge