OSDN Git Service

[automerger skipped] Merge changes from topic "location_provider" am: 79b473ed7b
authorJiyong Park <jiyong@google.com>
Fri, 25 May 2018 11:26:20 +0000 (04:26 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 25 May 2018 11:26:20 +0000 (04:26 -0700)
commit6a2ccc107c4bcb38bc4ec21d29c3a31083d58da6
tree62f713a9e001158afa8af55744fe833cf500b934
parentade5c9c811f13cfa0b058f731aea24d847e65ede
parent77390bf3077e316dff4d59f9dcf8ce32cf987b13
[automerger skipped] Merge changes from topic "location_provider" am: 79b473ed7b
am: 77390bf307  -s ours

Change-Id: I5ef31499bd1e21237fa8a1752c035ae8341235b9