tree a3c3f4088956242be657acb2fa3d1378b237476e
parent 71f8454eccba108f06ff8c8bbbc2eba5f8e01fc7
parent 0af088d126665257ba55eca44f7644cb6b972a61
author Mathieu Chartier <mathieuc@google.com> 1469855964 +0000
committer android-build-merger <android-build-merger@google.com> 1469855964 +0000

Merge \"Revert \"Revert \"Use try lock to fix class resolution race\"\"\"
am: 0af088d126

Change-Id: If34912dd115472f4fb2a84dd82a0b1d91c488a06