Yifan Hong 8a2befbe22 Merge "fix fingerprint condition on sdk level logic" into pi-dev ...

am: 69e88693d8

Change-Id: Ie587e46c28e81c051103fb5a8d5053d5a4ebd583

2018-05-18 12:16:10 -07:00

..

java/com/android/server

Merge "fix fingerprint condition on sdk level logic" into pi-dev

2018-05-18 12:16:10 -07:00

jni

Merge "Clearer GnssDebug text output" into pi-dev

2018-05-07 11:10:04 -07:00

Android.bp

…