Nick Kralevich 1b28b05d2e resolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65 am: fa632f6ad7 ... am: 9ec978732f * commit '9ec978732f8dd82e7adef3e37097eaca3fbd65f0': DO NOT MERGE: fix build breakage		2015-10-23 02:02:42 +00:00
..
android	DO NOT MERGE: Introduce stem keycodes for Wear	2015-06-24 14:42:17 -07:00
batteryservice	BatteryProperty: Add property ENERGY_COUNTER and 64-bit integer properties	2014-05-16 03:05:11 +00:00
binder	am 80e81505: Merge "binder: Add {read,write}Uint32 methods to Parcel"	2014-12-01 19:27:00 +00:00
diskusage
gui	libgui: Allow an IGBProducer to disable allocation	2015-04-23 15:28:12 -07:00
input	resolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65 am: fa632f6ad7	2015-10-23 02:02:42 +00:00
media	Revert "omx: add Intel's SemiPlanar OMX color format that is used on some devices"	2015-02-11 09:58:58 -08:00
powermanager	Make IPowerManager native conform to .aidl for oneway	2014-09-05 17:12:24 -07:00
private	Fix issue #18356768: some app process may hang at Runtime#exit...	2014-11-13 17:09:59 -08:00
ui	libgui: Allow an IGBProducer to disable allocation	2015-04-23 15:28:12 -07:00