Jim Miller 6230cdf572 am 262dc4da: Merge "Update TrustAgentService API after review" into lmp-mr1-dev ...

* commit '262dc4dafede871712d89f35d630ab2a332ee6cb':
  Update TrustAgentService API after review

2014-11-06 02:57:39 +00:00

..

java

Merge "Update TrustAgentService API after review" into lmp-mr1-dev

2014-11-06 02:52:20 +00:00

jni

Few more small meminfo improvements.

2014-11-03 13:58:11 -08:00

res

am cdb72e23: am c2a0d9e5: am 66c46c4a: am 3a9321d4: Docs: Fix typo in Preference android:order attribute.

2014-11-05 21:55:40 +00:00

tests

Rename BROADCAST_SCORE_NETWORKS to BROADCAST_NETWORK_PRIVILEGED.

2014-11-04 10:55:49 -08:00