Kenny Root a43a0d76a4 resolved conflicts for merge of 91e485fa to mnc-dev-plus-aosp ... Change-Id: Ibb4a2058e585218bdeaf4c1d568093fbbd8f6478		2015-05-13 09:10:17 -07:00
..
android	resolved conflicts for merge of 91e485fa to mnc-dev-plus-aosp	2015-05-13 09:10:17 -07:00
batteryservice	BatteryProperty: Add property ENERGY_COUNTER and 64-bit integer properties	2014-05-16 03:05:11 +00:00
binder	Add body sensors app op - framework native	2015-05-01 13:51:45 -07:00
diskusage	More changes to fix PDK build:	2012-10-24 12:30:41 -07:00
gui	libgui: Hook up onFrameReplaced	2015-05-12 09:35:29 -07:00
input	Introduces navigation keycodes.	2015-04-16 09:09:17 -07:00
media	OMX: add event for rendering an output frame by a tunneled decoder	2015-04-24 13:33: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: Allow an IGBProducer to disable allocation	2015-04-23 15:28:12 -07:00