Bryce Lee 698b33ea7f Merge "Add ability to set whether audio route is allowed in BluetoothHeadsetClient" into cw-e-dev am: 4636770f0d ...

am: 3b6f9f78cf

* commit '3b6f9f78cf0ea09176250059653d05cf6a5282c4':
  Add ability to set whether audio route is allowed in BluetoothHeadsetClient

2015-10-29 07:23:06 +00:00

..

java

Merge "Add ability to set whether audio route is allowed in BluetoothHeadsetClient" into cw-e-dev am: 4636770f0d

2015-10-29 07:23:06 +00:00

jni

Merge "Revert "Revert "Track ashmem memory usage in Parcel""" into mnc-dr-dev am: 93a6b4c129 am: a53bbb652b

2015-10-23 18:25:02 +00:00

res

Merge "Make SYSTEM_ALERT_WINDOW development permission" into mnc-dr-dev am: 2658cb002a am: 35151fbc8b

2015-10-29 01:33:09 +00:00

tests

am b57dd722: resolved conflicts for a884d81e to stage-aosp-master

2015-09-24 17:14:10 +00:00