Jeff Davidson 63226dd8f3 Merge "Allow apps with SCORE_NETWORKS to set the active scorer." into lmp-mr1-dev ...

automerge: 24f535b

* commit '24f535b87341b8729d6d4235acc51f0e87916d3a':
  Allow apps with SCORE_NETWORKS to set the active scorer.

2014-11-06 01:32:55 +00:00

..

java

Merge "Allow apps with SCORE_NETWORKS to set the active scorer." into lmp-mr1-dev

2014-11-06 01:25:04 +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