OSDN Git Service

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

Change-Id: Icc27f56679886cddbacdd2fcb198bdeeafdd1904


Trivial merge