OSDN Git Service

Revert "Use try lock to fix class resolution race" am: adc538a57a
authorMathieu Chartier <mathieuc@google.com>
Wed, 24 Aug 2016 16:49:43 +0000 (16:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 24 Aug 2016 16:49:43 +0000 (16:49 +0000)
am: 1f678c0b95  -s ours

Change-Id: Ieae39f6019669a0a5c17e2714261ab54a4e2aab6


Trivial merge