Michael Wright 7d3ad69530 Merge commit '71997c1a' into manualmerge ... Change-Id: Ia68fbd20ce66571dfd33764e52c3a00e2285e648		2015-06-23 19:04:31 +01:00
..
android	Merge commit '71997c1a' into manualmerge	2015-06-23 19:04:31 +01:00
batteryservice	BatteryProperty: Add property ENERGY_COUNTER and 64-bit integer properties	2014-05-16 03:05:11 +00:00
binder	Enable more flexible usage of blobs in parcels.	2015-06-05 17:40:59 -07:00
diskusage
gui	libgui/SurfaceFlinger: Add getConsumerName	2015-06-08 09:40:49 -07:00
input	Add method to set action button on MotionEvent	2015-06-17 21:06:54 +01:00
media	media: change parameters for OMX_EventOutputRendered	2015-06-05 17:53:40 -07: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	libgui: Add generation numbers to BufferQueue	2015-06-03 11:09:33 -07:00