| commit | 3f3237f4b1492accc54144f966fcb95d90dc7162 | [log] [tgz] |
|---|---|---|
| author | Chris Thornton <thorntonc@google.com> | Mon Jun 12 16:44:22 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jun 12 16:44:22 2017 +0000 |
| tree | 261e7ce223cb04274d17bfdec304febb9661473c | |
| parent | 9252fe692571258dc216c73903a9813662afd189 [diff] | |
| parent | 5375d9360f2a6edaae2e04b00b361dc1ccfe1e56 [diff] |
Merge "Prevent ConcurrentModificationException in updateAllRecognitions" into oc-dev am: 484fb951e0 -s ours am: 5375d9360f Change-Id: Ib2dd5a0264733ab829c2976eef29a68056aacc2c