Derek Sollenberger cab9d4e199 resolve merge conflicts of 928b30a to master ...

Change-Id: I476d653a00e62d171f29e1d5a2f800a0f3a75f00

2016-03-25 13:59:36 -04:00

..

androidfw

Merge "AssetManager: Cache a pre-filtered list of configurations" into nyc-dev

2016-03-10 05:11:50 +00:00

common_time

common_time_server.cpp: more O_CLOEXEC

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

hwui

resolve merge conflicts of 928b30a to master

2016-03-25 13:59:36 -04:00

input

Introduce pointer capture API.

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

storage

Update calls to IInterface::asBinder()

2014-11-17 10:05:31 -08:00

usb

…