Jack He b6b7999966 Merge "Merge "Bluetooth: Enable Multi-A2DP/HFP support for up to 5 devices" am: 6ec103c746 am: 472ff2a79d" into pi-dev-plus-aosp ...

am: bfd4a037b6

Change-Id: I7aade4a7c227208a9d0efaebcd119c6b5823a2bb

2018-03-06 02:19:37 +00:00

..

java

Merge "Improve javadocs of some DPM APIs"

2018-03-05 19:49:24 +00:00

jni

Merge "AID: Change loop to repeat and set from xml"

2018-03-05 01:23:19 +00:00

proto/android

Merge "Modifying proto csv output to include privacy levels."

2018-03-03 00:02:52 +00:00

res

Merge "Merge "Bluetooth: Enable Multi-A2DP/HFP support for up to 5 devices" am: 6ec103c746 am: 472ff2a79d" into pi-dev-plus-aosp

2018-03-06 02:19:37 +00:00

tests

Merge "Merge textclassifier/logging/ into textclassifier/"

2018-03-05 15:07:40 +00:00