Siddharth Ray a09adc6db1 Merge "Obtain cellular related battery statistics" ...

am: 4b0172bcb6

Change-Id: I364d329e92a6bd92ce601d34c94a92c91f09eb38

2018-03-06 20:08:15 +00:00

..

java

Merge "Obtain cellular related battery statistics"

2018-03-06 20:08:15 +00:00

jni

Don't use cutils/Atomic.h

2018-02-23 15:02:42 -08:00

proto/android

Bluetooth: Use enums for adapter connection states

2018-03-05 11:23:31 -08:00

res

Merge "Bluetooth: Enable Multi-A2DP/HFP support for up to 5 devices"

2018-03-06 00:35:28 +00:00

tests

Merge "frameworks/base: Set LOCAL_SDK_VERSION where possible."

2018-03-01 11:46:29 +00:00