Doris Liu 9d5c93f407 resolve merge conflicts of 0e89f98 to nyc-dev-plus-aosp ...

Change-Id: Ifa9dea0e4a0337c24dad899a10b5def46679742c

2016-04-08 13:31:42 -07:00

..

androidfw

Merge "AAPT2: Suppress warnings from libandroidfw when built for host" into nyc-dev

2016-03-30 23:39:02 +00:00

common_time

common_time_server.cpp: more O_CLOEXEC

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

hwui

resolve merge conflicts of 0e89f98 to nyc-dev-plus-aosp

2016-04-08 13:31:42 -07:00

input

Introduce pointer capture API.

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

storage

…

usb

…