Lajos Molnar 147372fdf9 resolved conflicts for merge of 67d8bd66 to lmp-mr1-dev-plus-aosp ... Change-Id: I5e7e6fdf0d2afe6c3e4a0ed6ef96afb4713a72bc		2014-09-19 06:23:46 -07: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	resolved conflicts for merge of 67d8bd66 to lmp-mr1-dev-plus-aosp	2014-09-19 06:23:46 -07:00
input	New keycode definitions for TV remotes.	2014-09-02 13:48:25 -07:00
media	Add support for max res decode	2014-08-28 18:00:58 -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