Commit b907d241 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" am: 4eb6fa0e 

am: b4cad762

Change-Id: Ia5e21fc613e39bd73e0b6c8525058c2a9e70d7b8
parents fd3ba6ec b4cad762
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