Commit ab4e9edd authored by Mathieu Chartier's avatar Mathieu Chartier Committed by android-build-merger
Browse files

Use try lock to fix class resolution race am: 1386f861 

am: 43f36646  -s ours

Change-Id: Ifd4182a3b0dd2f95edf0d745e7be9d7e390b93f6
parents 3906e33c 43f36646
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment