Lajos Molnar c75fd04d78 am da7cbd8c: Merge "media: refine kMetadataBufferTypes" into mnc-dev ... * commit 'da7cbd8c7c54c2c93ca7bc49b5218cf99825f9e4': media: refine kMetadataBufferTypes		2015-06-02 14:24:14 +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	Track camera and flashlight usage in battery stats.	2015-06-01 16:55:07 -07:00
diskusage
gui	Merge "fix BufferItem flatten/unflatten alignment" into mnc-dev	2015-05-22 19:04:05 +00:00
input	Fix input tests to work with new MotionEvent member	2015-05-14 16:29:13 +01:00
media	media: refine kMetadataBufferTypes	2015-05-29 19:05:41 -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: Allow an IGBProducer to disable allocation	2015-04-23 15:28:12 -07:00