OSDN Git Service

Use try lock to fix class resolution race am: 1386f8619b
authorMathieu Chartier <mathieuc@google.com>
Wed, 24 Aug 2016 16:44:12 +0000 (16:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 24 Aug 2016 16:44:12 +0000 (16:44 +0000)
am: 43f36646a9  -s ours

Change-Id: Ifd4182a3b0dd2f95edf0d745e7be9d7e390b93f6


Trivial merge