Leon Scroggins III ee35410ff8 am a7501119: am 69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE ...

* commit 'a7501119e341626536ce12c3539c2f9a986a2945':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE

2015-04-23 16:20:02 +00:00

..

java

am 88add689: am a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev

2015-01-29 18:36:59 +00:00

jni

am a7501119: am 69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE

2015-04-23 16:20:02 +00:00

res

Import translations. DO NOT MERGE

2014-08-22 10:39:35 -07:00

tests

am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation

2015-01-30 22:01:50 +00:00