OSDN Git Service

Merge "Make the binder_lock category optional"
authorHoward Chen <howardsoc@google.com>
Wed, 17 May 2017 07:38:36 +0000 (07:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 17 May 2017 07:38:36 +0000 (07:38 +0000)
am: 61e58d5a47

Change-Id: I6fec33b45edd7665d26f4c5ad5e9c7f4f7ce7d21


Trivial merge