OSDN Git Service

Merge "Prevent ConcurrentModificationException in updateAllRecognitions" into oc...
authorChris Thornton <thorntonc@google.com>
Mon, 12 Jun 2017 16:38:33 +0000 (16:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 12 Jun 2017 16:38:33 +0000 (16:38 +0000)
am: 722550cc3c  -s ours

Change-Id: Ia7ed4ded824000ecf111f4ec2886a50dea67fa76


Trivial merge