| commit | 93fe09a13cf35b9fc0e6f94bbf98b900e7d29050 | [log] [tgz] |
|---|---|---|
| author | Martijn Coenen <maco@google.com> | Fri Jun 07 01:38:16 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jun 07 01:38:16 2019 -0700 |
| tree | 3028965ec30c185881eeb6599447e8371d9bd2f2 | |
| parent | 9d6da0fc44bed30dbc367401f1e77411855ddcd8 [diff] | |
| parent | c4a564a10ac88cbb3272a452d49edca59899baf5 [diff] |
[automerger skipped] Merge "Reconcile binder JNI with earlier changes, removing lock." am: c4a564a10a -s ours am skip reason: change_id I4e06b3f93e30ed1c7868ec9e018709a7e796e441 with SHA1 c1493b283b is in history Change-Id: I7b4bc1e7295383e9afa31210aff3c1bae6728831