Robert Carr dbf956b62c Merge "Ensure getParentSurfaceControl and getSurfaceControl return valid or null SC" into qt-dev ...

am: ce3cd94e44

Change-Id: I468d9fbccb2f2b5443dc082ce4582dbaea441fb0

2019-04-05 12:18:10 -07:00

..

java/com/android/server

Merge "Ensure getParentSurfaceControl and getSurfaceControl return valid or null SC" into qt-dev

2019-04-05 12:18:10 -07:00

jni

Restore gnss@1.1 HAL capability bits removed in gnss@2.0 (framework)

2019-04-04 17:15:48 +00:00

xsd

Merge "Add Vts test for xsd_config"

2019-04-05 06:50:43 +00:00

Android.bp

Merge "Use IDnsResolver instead of INetd for resolver related binder commands" am: b9ef4dd299 am: 1711278ce2

2019-03-29 02:24:24 -07:00