Neil Fuller 837261cc99 Merge "Fix HttpResponseCacheTest in anticipation of an OkHttp upgrade."

2015-01-12 14:50:36 +00:00

..

java

Merge "[ActivityManager] Distinguish FG or BG receiver finished"

2015-01-12 13:45:13 +00:00

jni

Merge "Core/jni: Disallow relocation for decryption"

2015-01-07 22:05:12 +00:00

res

Import translations. DO NOT MERGE

2014-10-30 15:17:39 -07:00

tests

Fix HttpResponseCacheTest in anticipation of an OkHttp upgrade.

2015-01-09 11:50:50 +00:00