OSDN Git Service

Merge "Fix ConcurrentModificationException from LocationController" into oc-dev am...
authorJason Monk <jmonk@google.com>
Thu, 22 Jun 2017 20:53:11 +0000 (20:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 22 Jun 2017 20:53:11 +0000 (20:53 +0000)
am: ce3775bbf7

Change-Id: I763b909dd371450f50ebe03bb20655bad23793da


Trivial merge