From: Pablo Ceballos <pceballos@google.com>
Date: Sat, 20 Feb 2016 00:40:22 +0000 (+0000)
Subject: Merge "DO NOT MERGE BQ: Add permission check to BufferQueueConsumer::dump" into klp... 
X-Git-Tag: android-x86-7.1-r1~326^2~10^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=15c5c3e6ed6dc11bfe3bd7d7a0e4436cc37d5632;p=android-x86%2Fframeworks-native.git

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

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

15c5c3e6ed6dc11bfe3bd7d7a0e4436cc37d5632