John Spurlock 689dd8fb5b Merge "Zen: Changes to support new priority settings."

2015-04-03 20:07:56 +00:00

..

java/com/android/server

Merge "Zen: Changes to support new priority settings."

2015-04-03 20:07:56 +00:00

jni

Prepare to make Fingerprint API public.

2015-04-01 19:20:08 -07:00

Android.mk

resolved conflicts for merge of 962a11ad to master

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