Nick Kralevich 7f1ea80d65 resolve merge conflicts of 834ac204ce to klp-modular-dev. ... Bug: 23905002 Change-Id: Ic7262861af91a8fff27692c0f68761cb3ab12aa3		2015-10-22 17:26:28 -07:00
..
android	Merge "Add heart rate to ASensorEvent" into klp-modular-dev	2014-05-27 18:02:49 +00:00
batteryservice	batteryservice: add battery current now and charge counter data	2013-08-07 18:30:13 +00:00
binder	Add support for writing byte arrays to parcels	2014-03-13 14:17:40 -07:00
diskusage	More changes to fix PDK build:	2012-10-24 12:30:41 -07:00
gui	Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors	2014-04-11 00:06:06 +00:00
input	resolve merge conflicts of 834ac204ce to klp-modular-dev.	2015-10-22 17:26:28 -07:00
media	Support CAST V2 Authentication in MediaDrm	2014-03-29 08:41:39 -07:00
powermanager	Native counterpart of new power manager method	2013-10-25 12:50:04 -07:00
private	Allow "opaque" flag to be updated. DO NOT MERGE	2014-02-18 15:55:42 -08:00
ui	fix camera API 2.0 orientation	2013-09-17 23:45:22 -07:00