replicant-frameworks_native/services/batteryservice
Ricardo Cerqueira 1cdd1b5ad2 Android 6.0.0 release 26
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlYxAgIACgkQ6K0/gZqxDnjCqACfbBT6VOiUFQvRn7w1SAa+4rjF
 1IwAn2rBUqWo0dOKVwF1DDfFmGZXc8SB
 =1BqV
 -----END PGP SIGNATURE-----

Merge tag 'android-6.0.0_r26' into HEAD

Android 6.0.0 release 26

Conflicts:
	include/android/input.h

Change-Id: Ifa374c6d3055be3b8a5d60967f8b4c0043da739b
2015-11-05 01:41:42 +00:00
..
Android.mk Frameworks/native: Wall Werror in batteryservice & powermanager 2014-11-13 14:31:11 -08:00
BatteryProperties.cpp Android 6.0.0 release 26 2015-11-05 01:41:42 +00:00
BatteryProperty.cpp
IBatteryPropertiesListener.cpp Frameworks/native: Wall Werror in batteryservice & powermanager 2014-11-13 14:31:11 -08:00
IBatteryPropertiesRegistrar.cpp native: dock battery 2015-10-17 14:04:39 -07:00