OSDN Git Service

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

Change-Id: I9be0689c6ad9e6c25a1f51c6368e539a841afa0c


Trivial merge