Leon Scroggins III 60d7c9fcbc am 6db29a92: am f828f43f: am 38cf068c: am 16ac8ad7: am 4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE ...

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

2015-04-24 17:54:50 +00:00

..

java

am 55555a3d: Fixes rejected dismiss gestures (framework version of ag/677161)

2015-04-24 17:31:31 +00:00

jni

am 6db29a92: am f828f43f: am 38cf068c: am 16ac8ad7: am 4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE

2015-04-24 17:54:50 +00:00

res

am b792f433: Merge "DO NOT MERGE: Make wifi scan interval when disconnected configurable." into lmp-mr1-modular-dev

2015-04-17 23:55:21 +00:00

tests

Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS

2015-04-17 11:50:29 -07:00