OSDN Git Service

[automerger skipped] Merge changes from topic "location_provider" am: 79b473ed7b...
authorJiyong Park <jiyong@google.com>
Fri, 25 May 2018 12:11:27 +0000 (05:11 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 25 May 2018 12:11:27 +0000 (05:11 -0700)
am: 6a2ccc107c  -s ours

Change-Id: I4063ae283ea8ef0a43957bb5e1aaf68a14c63416


Trivial merge