Jeff Sharkey 4786aec7cc Merge "Annotate @SystemApi with required permissions." into oc-dev ...

am: c1406978a4

Change-Id: I305967cad945a807c3f8234efabaad0ef8b591d1

2017-06-05 22:28:21 +00:00

..

java

Merge "Annotate @SystemApi with required permissions." into oc-dev

2017-06-05 22:28:21 +00:00

jni

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

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