OSDN Git Service

Merge "Prevent ConcurrentModificationException in updateAllRecognitions" into oc...
authorChris Thornton <thorntonc@google.com>
Sun, 11 Jun 2017 18:03:32 +0000 (18:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sun, 11 Jun 2017 18:03:32 +0000 (18:03 +0000)
am: 1761985e42

Change-Id: Ifad48a57d045c8b8548d8ca9cc659a16a9a2d1bf


Trivial merge