Nick Kralevich 9ec978732f resolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65 ... am: fa632f6ad7 * commit 'fa632f6ad7be6b1f488dd3d1b825a82456db5097': DO NOT MERGE: fix build breakage		2015-10-23 01:52:34 +00:00
..
android	New keycode definitions for TV remotes.	2014-09-02 13:48:25 -07:00
batteryservice	BatteryProperty: Add property ENERGY_COUNTER and 64-bit integer properties	2014-05-16 03:05:11 +00:00
binder	Add tracking of parcel memory allocations.	2014-11-11 16:23:04 -08:00
diskusage	More changes to fix PDK build:	2012-10-24 12:30:41 -07:00
gui	CpuConsumer: lock buffers that could be YUV as ycbcr	2015-01-28 16:52:43 -08:00
input	resolve merge conflicts of 834ac204ce to klp-modular-dev.	2015-10-23 01:44:26 +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	Initialize ARect fields in default ctor	2014-10-28 16:41:10 -07:00