Nick Kralevich 6eac97d4ba resolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65 am: fa632f6ad7 am: 9ec978732f am: 1b28b05d2e am: 0370a03b6e ... am: 18e7c64ea8 * commit '18e7c64ea82e002978ef069884d195e02e7302df': DO NOT MERGE: fix build breakage		2015-10-23 04:23:35 +00:00
..
android	DO NOT MERGE Revert "am f37143d8: Merge "Cancel touches as well as pointer gestures." into mnc-dev"	2015-09-22 22:05:48 +01:00
batteryservice	Show charging speed on Keyguard	2015-07-10 13:10:13 -07:00
binder	Revert "Track ashmem memory usage in Parcel"	2015-10-22 22:09:16 +00:00
diskusage	More changes to fix PDK build:	2012-10-24 12:30:41 -07:00
gui	Bug fix in SensorManager.	2015-07-30 19:05:21 +00:00
input	resolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65 am: fa632f6ad7 am: 9ec978732f am: 1b28b05d2e am: 0370a03b6e	2015-10-23 04:23:35 +00:00
media	omx: fix structure sizes to be the same on 32 and 64-bit builds	2015-07-21 00:19:04 +00:00
powermanager	Make IPowerManager native conform to .aidl for oneway	2014-09-05 17:12:24 -07:00
private	libgui/SF: Propagate SECURE Layer flag changes	2015-06-18 15:11:20 -07:00
ui	SF: Add colorTransform to DisplayInfo	2015-08-31 13:41:24 -07:00