Bart Sears ffc8723d88 Merge "resolve merge conflicts of 82a8c5f to nyc-mr1-dev" into nyc-mr1-dev

2016-05-27 23:09:24 +00:00

..

java

Merge "ShortcutManager: Implement get-drawable APIs" into nyc-mr1-dev

2016-05-27 22:48:33 +00:00

jni

Merge "Force pending transactions to flush before screenshot." into nyc-dev

2016-05-25 19:16:13 +00:00

res

resolve merge conflicts of 82a8c5f to nyc-mr1-dev

2016-05-27 16:02:22 -07:00

tests

Improve performance of LocaleList with Resources

2016-05-24 12:54:48 -07:00