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

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

Change-Id: Ice2c1b83135368f11884f4d8b2cfab138715e69a
---

722550cc3cf2e22d70516045587f9f058e400fbb