Ian Pedowitz 87455c7397 Merge "Limit persistent ashmem backed fds to a minimum of 128kB." into mnc-dr-dev am: 966d6040c6 am: 95fc53b029 ...

am: d6f3e38738

* commit 'd6f3e38738c88821b28b2571d034fc1b189a35de':
  Limit persistent ashmem backed fds to a minimum of 128kB.

2015-11-03 22:21:48 +00:00

..

graphics

Merge "Limit persistent ashmem backed fds to a minimum of 128kB." into mnc-dr-dev am: 966d6040c6 am: 95fc53b029

2015-11-03 22:21:48 +00:00

opengl

resolved conflicts for a884d81e to stage-aosp-master

2015-09-24 10:01:32 -07:00