Myles Watson 158eae223d Merge "Auto-format BluetoothAdapter.java" am: 5416559d1c ...

am: 03e1dfa444

Change-Id: I03f20ed4511ffd2d5bfa55e57d8895635e9ab165

2017-12-06 20:22:01 +00:00

..

java

Merge "Auto-format BluetoothAdapter.java" am: 5416559d1c

2017-12-06 20:22:01 +00:00

jni

Merge "android.os.HidlSupport: add getPidIfSharable() for HALs" am: e72b6f0d31

2017-11-22 23:18:46 +00:00

proto/android

Add persistent state for Hearing Aid Profile

2017-11-28 07:27:29 +00:00

res

Merge "Convert framework.jar to Android.bp" into stage-aosp-master

2017-12-04 18:55:24 +00:00

tests

Adjust tests to new android-support-test + espresso libraries.

2017-12-01 16:50:03 +00:00