Chih-Hung Hsieh 85e0c89ba5 resolve merge conflicts of 1599b981 to nyc-dev-plus-aosp ...

Change-Id: I90807581e10b6a0024515ff634ac8b29eaa5fc9f

2016-04-28 12:08:15 -07: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

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

2016-04-28 12:08:15 -07: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

…