Commit 25e42cff authored by Howard Chen's avatar Howard Chen Committed by android-build-merger
Browse files

Merge "Make the binder_lock category optional" am: 61e58d5a am: c4a8373c am: f06f26bb 

am: c821f28f  -s ours

Change-Id: Ib6d4562fa23099469bf963037802b225457ec954
parents 27175b6c c821f28f
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment