John Reck 327cb3184d Merge "Yank ResourceCache out of Caches" into lmp-mr1-dev ...

automerge: 9c13b8c

* commit '9c13b8cfcc6e1d8b422488596538bd8b1f38df57':
  Yank ResourceCache out of Caches

2014-11-06 18:55:00 +00:00

..

java

Merge "Round charging indication to nearest minute" into lmp-mr1-dev

2014-11-06 16:22:06 +00:00

jni

Yank ResourceCache out of Caches

2014-11-06 09:45:10 -08:00

res

am 418f4ed0: Merge "Round charging indication to nearest minute" into lmp-mr1-dev

2014-11-06 16:26:12 +00:00

tests

Rename BROADCAST_SCORE_NETWORKS to BROADCAST_NETWORK_PRIVILEGED.

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