Dan Stoza d7214d6263 am 9d2c5a7c: Merge "libgui: Add generation numbers to BufferQueue" into mnc-dev ... * commit '9d2c5a7c678bd384df0fb29952cf8943e7b1b160': libgui: Add generation numbers to BufferQueue		2015-06-05 16:00:13 +00:00
..
android	Merge commit '217a04ba' into manualmerge	2015-05-18 15:19:30 -07:00
batteryservice	BatteryProperty: Add property ENERGY_COUNTER and 64-bit integer properties	2014-05-16 03:05:11 +00:00
binder	DO NOT MERGE Remove unused ParcelFileDescriptor methods in parcel.	2015-06-04 21:36:21 +00:00
diskusage
gui	libgui: Add generation numbers to BufferQueue	2015-06-03 11:09:33 -07:00
input	Fix input tests to work with new MotionEvent member	2015-05-14 16:29:13 +01:00
media	media: rename VideoGrallocMetadata.hHandle to pHandle	2015-06-02 19:43:37 -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