Lajos Molnar e7bda06398 resolved conflicts for merge of 67d8bd66 to lmp-dev-plus-aosp ... Change-Id: Idbe39c6de8fe31ac57a9238c18b4c20d66dc73ad		2014-09-18 20:05:27 -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	More changes to fix PDK build:	2012-10-24 12:30:41 -07:00
gui	resolved conflicts for merge of 67d8bd66 to lmp-dev-plus-aosp	2014-09-18 20:05:27 -07:00
input	am 3aa066e9: am 19f8b79f: Merge "New keycode definitions for TV remotes." into lmp-dev	2014-09-03 19:23:54 +00:00
media	am f7a8f90a: am 1173137a: Merge "Add support for max res decode" into lmp-dev	2014-09-10 01:17:45 +00: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