Jack He 24591d2641 Merge "Remove BluetoothDevice.ACTION_DISAPPEARED" ...

am: 2ac8c8a3e2

Change-Id: I8836294e7206c8e8c024f5b986c25b9cf2dd29d9

2018-10-12 11:06:44 -07:00

..

java

Merge "Remove BluetoothDevice.ACTION_DISAPPEARED"

2018-10-12 11:06:44 -07:00

jni

Merge "Respect extractNativeLibs in natively bridged environments"

2018-10-08 08:05:41 -07:00

proto

Merge "Phone service state change atom."

2018-10-10 15:24:17 -07:00

res

Merge "Remove BluetoothDevice.ACTION_DISAPPEARED"

2018-10-12 11:06:44 -07:00

tests

Merge changes from topic "aapt2-manifest-elements"

2018-10-10 16:13:26 -07:00