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

am: 9a6109f284

Change-Id: I0f1caf54cc544db0b73f8e3275005923904f57a8

2016-07-20 23:15:32 +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 commit \'f8bc27d9683e4089cdfd778dcb61ae67f44665b7\' into manual_merge_f8bc27d

2016-07-20 18:49:43 +00:00

res

Merge commit \'f8bc27d9683e4089cdfd778dcb61ae67f44665b7\' into manual_merge_f8bc27d

2016-07-20 18:49:43 +00:00

tests

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

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