Nick Kralevich fa632f6ad7 resolve merge conflicts of 834ac204ce to klp-modular-dev. ... am: 7f1ea80d65 * commit '7f1ea80d65996ab687ff56a884da915535cdc176': DO NOT MERGE: fix build breakage		2015-10-23 01:44:26 +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	Revert "Revert "Revert "Revert "Remove incorrect android_atomic_...64 use.""""	2014-09-02 16:11:46 -07:00
diskusage
gui	Fix sockfd leakage in SensorService.	2014-10-02 18:59:56 -07:00
input	resolve merge conflicts of 834ac204ce to klp-modular-dev.	2015-10-23 01:44:26 +00:00
media	media: add kMetadataBufferTypeGraphicBuffer	2014-10-13 22:58:03 -07:00
powermanager	Make IPowerManager native conform to .aidl for oneway	2014-09-05 17:12:24 -07:00
private	Have VirtualDisplays send SF resize messages when resizing	2014-07-30 11:23:44 -07:00
ui	surfaceflinger: add getDisplayStats() method	2014-09-18 17:03:20 -07:00