Commit eab0d9f1 authored by Paul Duffin's avatar Paul Duffin Committed by android-build-merger
Browse files

Merge "Rename nativeHoldsLock to holdsLock and make it work on current thread"... 

Merge "Rename nativeHoldsLock to holdsLock and make it work on current thread" am: 4eb6fa0e am: b4cad762
am: b907d241

Change-Id: Ie0637db3fad6d3d80abb77c6ff205fcd9ca6a97b
parents 04c79b30 b907d241
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