Bryce Lee e843e24681 am 9320e9f0: Merge "Update javadoc for DEFAULT_FEATURES deprecation." into lmp-mr1-dev automerge: e036ce2 ...

automerge: 7e6fbb3

* commit '7e6fbb361be7a0045b8c71f0b8c56f113121a7d4':
  Update javadoc for DEFAULT_FEATURES deprecation.

2015-01-13 21:07:16 +00:00

..

java

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

2015-01-13 21:07:16 +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