Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

[automerger skipped] Merge "Reconcile binder JNI with earlier changes, removing lock." am: c4a564a1 -s ours am: 93fe09a1 -s ours
am: 8eb7a6ba -s ours
am skip reason: change_id I4e06b3f93e30ed1c7868ec9e018709a7e796e441 with SHA1 c1493b28 is in history

Change-Id: I9624da4b76476d48ee683e6f0f4ac2ec05b7f474
parents e6c5f224 8eb7a6ba
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment