OSDN Git Service

Revert "Revert "Use try lock to fix class resolution race"" am: 23da026ec7
authorMathieu Chartier <mathieuc@google.com>
Wed, 24 Aug 2016 16:50:03 +0000 (16:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 24 Aug 2016 16:50:03 +0000 (16:50 +0000)
am: 4d6ad96cc0

Change-Id: I4e3d9b874d7eb3aef2bdbfc85ed8712601938519


Trivial merge