Ivan Podogov 903d6414e5 resolve merge conflicts of b1e2da7 to nyc-mr1-dev-plus-aosp ...

Test: build police
Change-Id: Ifec1ab6760ebb94b0b411c9c60f07066e151206b

2016-12-13 17:55:14 +00:00

..

java

resolve merge conflicts of b1e2da7 to nyc-mr1-dev-plus-aosp

2016-12-13 17:55:14 +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

Merge "Make the onRequestRecommendation() method async." am: fbeacb02c0

2016-12-13 16:19:14 +00:00