Jeff Sharkey c2ae6fb9ad Merge commit '605eb79c9519307147fc1795d0eb155638a7f542' into manualmerge ...

Change-Id: Id6db8cce3a477572478a1d50f624823200848896

2015-01-15 21:27:13 -08:00

..

java

Merge commit '605eb79c9519307147fc1795d0eb155638a7f542' into manualmerge

2015-01-15 21:27:13 -08: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

am dbe54533: am 77e1f7a2: Merge "Ensure scroll assets are drawn with correct opacity" into lmp-mr1-dev

2015-01-15 22:37:40 +00:00

tests

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

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