Nicolas Prévot fa58f454c1 am 6478b4f1: Merge "Clarify docs for user restrictions" into lmp-mr1-dev automerge: 6ab76bd automerge: e5d3ee8 ...

* commit '6478b4f19a527b0ca26485aaac477e4d4c83a5d5':
  Clarify docs for user restrictions

2015-01-13 20:33:24 +00:00

..

java

am 6478b4f1: Merge "Clarify docs for user restrictions" into lmp-mr1-dev automerge: 6ab76bd automerge: e5d3ee8

2015-01-13 20:33:24 +00:00

jni

Remove dead code from AssetStreamAdapter.

2015-01-12 18:13:27 -05:00

res

Import translations. DO NOT MERGE

2015-01-12 10:50:24 -08:00

tests

am f5f345cf: am 837261cc: Merge "Fix HttpResponseCacheTest in anticipation of an OkHttp upgrade."

2015-01-12 16:44:36 +00:00