commit | dc9e4e089d5595837265c0c9f67b2dccb8e254a0 | [log] [tgz] |
---|---|---|
author | Martijn Coenen <maco@google.com> | Fri Jun 07 01:52:25 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jun 07 01:52:25 2019 -0700 |
tree | 867575e69b8944116e13be086c90ddba6ba5d20c | |
parent | e68fb2f434309c4a96d35c0296377138a57801a3 [diff] | |
parent | 2154ab59b4d8e05166c2604078a089c76ce2495e [diff] |
[automerger skipped] Merge "Reconcile binder JNI with earlier changes, removing lock." am: c4a564a10a -s ours am: 93fe09a13c -s ours am: 8eb7a6bac2 -s ours am: 2154ab59b4 -s ours am skip reason: change_id I4e06b3f93e30ed1c7868ec9e018709a7e796e441 with SHA1 c1493b283b is in history Change-Id: I45ff03aa4c69dc26324434a265b6d238cf6d9a4d