OSDN Git Service

Merge "DO NOT MERGE BQ: Add permission check to BufferQueueConsumer::dump" into klp...
authorPablo Ceballos <pceballos@google.com>
Sat, 20 Feb 2016 00:59:54 +0000 (00:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 20 Feb 2016 00:59:54 +0000 (00:59 +0000)
commite4897cec75852fcb461a8dd3a403353eeb149f06
treecfa7e99db0e0e422029527180a2afe045c0542f6
parent738d34b162e0b54fbbc04f72c46204b5adb6554f
parentba2d7d4eda715453341bc2116cfcb6ac25990c8e
Merge "DO NOT MERGE BQ: Add permission check to BufferQueueConsumer::dump" into klp-dev am: c232606413 am: 1d0e811e5a  -s ours am: 8b6dea4fa8  -s ours am: 84cd1a325d am: 31b8553cee  -s ours am: 5fe5b47563 am: c6e289a359 am: 15c5c3e6ed
am: ba2d7d4eda  -s ours

* commit 'ba2d7d4eda715453341bc2116cfcb6ac25990c8e':
  DO NOT MERGE BQ: Add permission check to BufferQueueConsumer::dump