Chris Wren d958f83a01 resolve merge conflicts of 43c3a7e5 to nyc-mr1-dev ...

Change-Id: I85619e6d8176bf23b6f4090c4573e5d9c248b585

2016-06-02 12:15:35 -04:00

..

java

resolve merge conflicts of 43c3a7e5 to nyc-mr1-dev

2016-06-02 12:15:35 -04:00

jni

Copy native tree's property when mutate vector drawable

2016-05-27 10:54:55 -07:00

res

Merge "ShortcutManager: API rename" into nyc-mr1-dev

2016-06-01 22:44:11 +00:00

tests

Clean up Bluetooth test code.

2016-05-25 15:27:41 -07:00