Robert Carr 7de9f7a334 Merge "SurfaceView: Avoid initializing Surface from an invalid SurfaceControl." into oc-dev am: 401b8907d0 ...

am: 2f927d56cf

Change-Id: I2916aa9a24b84d4f379c8ebebc7e19eb4adc96f4

2017-07-07 03:29:06 +00:00

..

java

Merge "SurfaceView: Avoid initializing Surface from an invalid SurfaceControl." into oc-dev am: 401b8907d0

2017-07-07 03:29:06 +00:00

jni

Merge "Log errors on android.os.VintfObject.verify()" am: 54b1e9c57c am: 90a5fd0549

2017-07-06 20:31:21 +00:00

proto/android

Prune unused static libs and instant apps if space needed am: f36d53cbfc

2017-05-31 03:59:35 +00:00

res

NCI2.0 update LF_T3T_PARAMETERS of 18 byte. am: e7ecebae11 am: 93d313b0a0

2017-07-06 23:03:36 +00:00

tests

Merge "Add a Setting for whether or not we have been disabled by policy." into oc-dr1-dev

2017-07-06 22:03:36 +00:00