Pulkit Bhuwalka 229474ec38 Merge "Add IntDef to BluetoothAdapter IO_CAP constants" am: c1fd61b302 am: 84384d5980 ...

am: 44dfe29e61

Change-Id: If99923316742dbc18ce2c66bc529971ededba485

2018-08-21 03:36:21 -07:00

..

java

Merge "Add IntDef to BluetoothAdapter IO_CAP constants" am: c1fd61b302 am: 84384d5980

2018-08-21 03:36:21 -07:00

jni

Merge "MemoryIntArray: don't double close." am: 9b9728710f am: 71af69dba4

2018-08-14 16:17:02 -07:00

proto

Updating incident protos.

2018-08-13 18:51:06 -07:00

res

Turn off generic multi-window and multi-display.

2018-08-20 18:36:57 +00:00

tests

resolve merge conflicts of e58c780571 to stage-aosp-master

2018-08-16 16:41:38 -07:00