Skip to content
Commit 93fe09a1 authored by Martijn Coenen's avatar Martijn Coenen Committed by android-build-merger
Browse files

[automerger skipped] Merge "Reconcile binder JNI with earlier changes, removing lock." 

am: c4a564a1 -s ours
am skip reason: change_id I4e06b3f93e30ed1c7868ec9e018709a7e796e441 with SHA1 c1493b28 is in history

Change-Id: I7b4bc1e7295383e9afa31210aff3c1bae6728831
parents 9d6da0fc c4a564a1
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment