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)
commit8949e9fa29df47feea9088675d57173307896976
tree4446bcff828b47fd8d5ba572c7cfb8b60bd58c63
parent343023e7737dcfb6c2f35026f98998dd5ecf29aa
parent6a2ccc107c4bcb38bc4ec21d29c3a31083d58da6
[automerger skipped] Merge changes from topic "location_provider" am: 79b473ed7b am: 77390bf307  -s ours
am: 6a2ccc107c  -s ours

Change-Id: I4063ae283ea8ef0a43957bb5e1aaf68a14c63416