Matthew Fritze 43bded7dce Merge \\"Revert \\"Revert \\"Error colors to point to frameworks rather than hard-code them\\"\\"\\" into nyc-mr1-dev am: 9e7bd8de87 ...

am: 250664a032

Change-Id: I07908d20c83232ef91b7c45cb772d066584c33a0

2016-07-21 01:38:18 +00:00

..

java

Merge \\"Support multiple intents in ShortcutInfo\\" into nyc-mr1-dev am: b84ce2e034

2016-07-20 23:15:32 +00:00

jni

Merge \\"Fix VD animator not being properly resumed\\" into nyc-mr1-dev am: ffa880b83f

2016-07-20 23:22:03 +00:00

res

Merge \\"Revert \\"Revert \\"Error colors to point to frameworks rather than hard-code them\\"\\"\\" into nyc-mr1-dev am: 9e7bd8de87

2016-07-21 01:38:18 +00:00

tests

Merge \\"Add ApplicationErrorReport tests\\" into nyc-mr1-dev am: f86d855125

2016-07-15 20:19:15 +00:00