commit | f66404ce8fb6fe985ea93d968dd9b350e9b497ed | [log] [tgz] |
---|---|---|
author | Chris Thornton <thorntonc@google.com> | Mon Jun 12 16:46:58 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Jun 12 16:46:58 2017 +0000 |
tree | 6ebb9bf4fe62c63589279aa03c9e137a43638155 | |
parent | 3d8e0b6b6e924c15e2e4097532586d942d727756 [diff] | |
parent | 9252fe692571258dc216c73903a9813662afd189 [diff] |
Merge "Prevent ConcurrentModificationException in updateAllRecognitions" into oc-dev am: 484fb951e0 am: 722550cc3c -s ours am: 9252fe6925 Change-Id: I6c287fa3e59545e66d7c811adbbc4b1b08e6fe36