OSDN Git Service

Merge "Fix ConcurrentModificationException from LocationController" into oc-dev
authorJason Monk <jmonk@google.com>
Thu, 22 Jun 2017 17:37:55 +0000 (17:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 22 Jun 2017 17:37:55 +0000 (17:37 +0000)
am: 6791bee744

Change-Id: I2bd4481438c382c718d51c65fe3941e88c63b2c7


Trivial merge