Jeff Sharkey c5b5694202 Merge commit '7797e545239e81a9216994527badcc98178ebfcc' into dec10 ...

Change-Id: I430a39241bd2d278eaf1e01b89be3ad368789f6d

2016-12-10 16:29:23 -07:00

..

java

Merge commit '7797e545239e81a9216994527badcc98178ebfcc' into dec10

2016-12-10 16:29:23 -07:00

jni

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

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

res

Merge "Adding unlockProfile to trust-agent meta data and makes TrustAgent runnable under direct boot"

2016-12-10 00:37:19 +00:00

tests

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

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