Svetoslav Ganov 691c9a55a5 Merge "Fix an accidentally reverted condition" into pi-dev ...

am: 7c3c4d38a9

Change-Id: Ib99b815996d5dc7168f9f9fcd4cd09651a5a5fc9

2018-05-09 18:20:07 -07:00

..

java/com/android/server

Merge "Fix an accidentally reverted condition" into pi-dev

2018-05-09 18:20:07 -07:00

jni

Merge "Clearer GnssDebug text output" into pi-dev

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

Android.bp

…