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)
am: 77390bf307  -s ours

Change-Id: I5ef31499bd1e21237fa8a1752c035ae8341235b9


Trivial merge