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)
commit5375d9360f2a6edaae2e04b00b361dc1ccfe1e56
tree8e312890fe46911609f5bbf4fba18a0744bedaf3
parente1f9b3f19531d7ffcea69cca1c4fcf645a0ad3d0
parent484fb951e005584aeb22c5c2598898bc00eae22a
Merge "Prevent ConcurrentModificationException in updateAllRecognitions" into oc-dev
am: 484fb951e0  -s ours

Change-Id: I97dc24bc38e194b508a1b485ec4d7e1f8b62285d