TreeHugger Robot 49771cdf64 Merge "resolve merge conflicts of 4b092e4 to master"

2016-05-31 13:58:16 +00:00

..

java

Merge "resolve merge conflicts of 4b092e4 to master"

2016-05-31 13:58:16 +00:00

jni

Merge "Copy native tree's property when mutate vector drawable"

2016-05-28 01:11:23 +00:00

res

Import translations. DO NOT MERGE

2016-05-30 17:49:58 -07:00

tests

Merge "Improve performance of LocaleList with Resources" into nyc-dev am: bb26248bbb am: 5e106dea45

2016-05-24 21:47:36 +00:00