OSDN Git Service

Merge "Make the binder_lock category optional" am: 61e58d5a47 am: c4a8373ccd
authorHoward Chen <howardsoc@google.com>
Wed, 17 May 2017 07:52:28 +0000 (07:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 17 May 2017 07:52:28 +0000 (07:52 +0000)
commitc821f28ff2c0d367f1468501033162851b4b2848
treee840fbceddcded12685db6059b2d6279d9182983
parent5f44bd7228d91752be938e74584ed0ca789539ab
parentf06f26bbb52d919a9f9017d8dcad0ff79222ed1b
Merge "Make the binder_lock category optional" am: 61e58d5a47 am: c4a8373ccd
am: f06f26bbb5

Change-Id: I6f9d043a8a2ac1a3a1d6a1e135fb061b94edccba
cmds/atrace/atrace.cpp