Josh Gao 15dc5951e6 Merge "Add trace category for adb." ...

am: 6968d90dc5

Change-Id: Id542769172f3d40221a6b20ea8af1db5a70abfd1

2016-12-13 00:36:54 +00:00

..

java

Merge "Add trace category for adb."

2016-12-13 00:36:54 +00:00

jni

DO NOT MERGE: Implement metered tracking for NetworkStats summary queries.

2016-12-09 13:59:33 +09:00

res

DO NOT MERGE Add Bluetooth toggle prompts - framework

2016-12-12 09:50:24 -08:00

tests

DO NOT MERGE: Implement metered tracking for NetworkStats summary queries.

2016-12-09 13:59:33 +09:00