From: Chris Thornton <thorntonc@google.com>
Date: Mon, 12 Jun 2017 16:37:03 +0000 (+0000)
Subject: Merge "Prevent ConcurrentModificationException in updateAllRecognitions" into oc-dev
X-Git-Tag: android-x86-9.0-r1~813^2~661
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5375d9360f;p=android-x86%2Fframeworks-base.git

Merge "Prevent ConcurrentModificationException in updateAllRecognitions" into oc-dev
am: 484fb951e0  -s ours

Change-Id: I97dc24bc38e194b508a1b485ec4d7e1f8b62285d
---

5375d9360f2a6edaae2e04b00b361dc1ccfe1e56