Jean-Michel Trivi b0eb08b521 Merge "Remove the 5 sec timeout logic for setVolumeControlStream" into mnc-dev

2015-05-22 15:51:35 +00:00

..

java/com/android/server

Merge "Remove the 5 sec timeout logic for setVolumeControlStream" into mnc-dev

2015-05-22 15:51:35 +00:00

jni

Move from native FingerprintService implementation to fingerprintd

2015-05-20 14:56:06 -07:00

Android.mk

resolved conflicts for merge of 962a11ad to master

2015-03-31 11:15:39 +01:00