Bryce Lee 7e6fbb361b am 9320e9f0: Merge "Update javadoc for DEFAULT_FEATURES deprecation." into lmp-mr1-dev ...

automerge: e036ce2

* commit 'e036ce2e7044efcc8be71241a7e0a1523955f20c':
  Update javadoc for DEFAULT_FEATURES deprecation.

2015-01-13 19:05:15 +00:00

..

java

am 9320e9f0: Merge "Update javadoc for DEFAULT_FEATURES deprecation." into lmp-mr1-dev

2015-01-13 19:05:15 +00:00

jni

resolve merge conflicts of 0f647c1 to lmp-mr1-dev-plus-aosp.

2015-01-09 17:19:45 -08:00

res

Import translations. DO NOT MERGE

2015-01-12 09:07:58 -08:00

tests

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

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