OSDN Git Service

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

Change-Id: Ic196684640f2bad1b24837bdefd902305b4eb785


Trivial merge