tree e7393b38d5beedd6e8080937caddacbec0be6b13
parent d1e7d3d73e415778f6842488ba8da4b40a6478b1
parent d3178c4ed52358009d51518551325b5b0c84de67
author Chris Thornton <thorntonc@google.com> 1497282864 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1497282873 +0000

Merge "Prevent ConcurrentModificationException in updateAllRecognitions" into oc-dev