OSDN Git Service

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

Change-Id: Ice2c1b83135368f11884f4d8b2cfab138715e69a


Trivial merge