John Reck 1fd9f81745 Merge "Support transform\'d GraphicBuffers" into nyc-dev ...

am: 6d42b5c6e3

* commit '6d42b5c6e399a10799d2bba3f7113dd198cbcae6':
  Support transform'd GraphicBuffers

Change-Id: I620f9ef9e1e2ce4df6471b37d1ec06b0fcdb2a88

2016-04-29 14:55:28 +00:00

..

androidfw

resolve merge conflicts of 1599b981 to nyc-dev-plus-aosp

2016-04-28 12:08:15 -07:00

common_time

common_time_server.cpp: more O_CLOEXEC

2015-12-18 20:47:02 -08:00

hwui

Merge "Support transform\'d GraphicBuffers" into nyc-dev

2016-04-29 14:55:28 +00:00

input

Introduce pointer capture API.

2015-12-18 10:22:43 -08:00

storage

Fix google-explicit-constructor warnings.

2016-04-27 11:38:12 -07:00

usb

resolved conflicts for merge of 1a4527ce to lmp-mr1-dev-plus-aosp

2014-09-19 16:13:49 -07:00