OSDN Git Service

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

Change-Id: I97dc24bc38e194b508a1b485ec4d7e1f8b62285d


Trivial merge