Neil Fuller 7014da74e8 resolved conflicts for merge of 7382c02d to lmp-mr1-dev-plus-aosp ...

Change-Id: Idfa2750230aa56e7ae34fcc33d62558df942abd0

2015-01-20 13:21:58 +00:00

..

java

resolved conflicts for merge of 7382c02d to lmp-mr1-dev-plus-aosp

2015-01-20 13:21:58 +00:00

jni

am 0de2eca5: am 112e35b4: Merge "Update generationId on bitmaps when decoded into by BitmapRegionDecoder" into lmp-mr1-dev

2015-01-15 23:15:56 +00:00

res

Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

2015-01-15 23:39:49 +00:00

tests

am b55011e4: am f9c04f17: Merge "Removing HttpResponseCacheTest"

2015-01-16 10:29:51 +00:00