Andrew Sapperstein 9a2c4f867c Merge \"Add DeviceDefault style used by ringtone picker.\" into nyc-mr1-dev ...

am: 411b9c69a1

Change-Id: I8742ff9342285bfb72f7f8cf68226a0d46d6d880

2016-06-24 18:42:12 +00:00

..

java

Merge \"Fix NPE for checking for whether animators should play together\" into nyc-mr1-dev

2016-06-24 17:53:06 +00:00

jni

Merge \\"Remove FD from the right Looper\\" into nyc-dev am: db13dd41a9

2016-06-23 18:45:16 +00:00

res

Merge \"Add DeviceDefault style used by ringtone picker.\" into nyc-mr1-dev

2016-06-24 18:42:12 +00:00

tests

Merge \\"Fixed notificaiton Stress Test\\" into nyc-dev am: 2f59ee10b2

2016-06-21 23:37:46 +00:00