commit | 25e42cff5eb1cddfd8b7842673a7f317f0d95a30 | [log] [tgz] |
---|---|---|
author | Howard Chen <howardsoc@google.com> | Wed May 17 07:55:36 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed May 17 07:55:36 2017 +0000 |
tree | abe1e9d38a7d92033cb94f38843b773f53d16948 | |
parent | 27175b6c169939f97d89c3b9f4beac053934d52d [diff] | |
parent | c821f28ff2c0d367f1468501033162851b4b2848 [diff] |
Merge "Make the binder_lock category optional" am: 61e58d5a47 am: c4a8373ccd am: f06f26bbb5 am: c821f28ff2 -s ours Change-Id: Ib6d4562fa23099469bf963037802b225457ec954