Robert Carr a7dfbc9437 Merge "Merge "Correctly clear resizing drawable when nulling background." into nyc-dev am: a3ec065a43 am: fe25025c5c" into nyc-mr1-dev-plus-aosp ...

am: abb81c5972

* commit 'abb81c59729ad97e1207449c84f8e96986ea2a6a':
  Correctly clear resizing drawable when nulling background.

Change-Id: I50ee5eda0a88af238719a83a3e39ed81da0f2dbe

2016-05-20 23:13:36 +00:00

..

java

Merge "Merge "Correctly clear resizing drawable when nulling background." into nyc-dev am: a3ec065a43 am: fe25025c5c" into nyc-mr1-dev-plus-aosp

2016-05-20 23:13:36 +00:00

jni

stephenli@ manually merge many commits up to '032dcff'

2016-05-19 23:51:32 +00:00

res

Merge "Fix cut off actions in messaging style" into nyc-dev am: cbfef08990 am: d5d76f6d5c

2016-05-20 22:26:53 +00:00

tests

Merge "Merge "Fix parsing of kernel wakelocks" into nyc-dev am: 6f0d399214 am: 7dd96663a0" into nyc-mr1-dev-plus-aosp

2016-05-20 17:43:40 +00:00