Makoto Onuki c4e64bc449 Merge \\"ShortcutManager: deal with changing resource IDs on app update\\" into nyc-mr1-dev am: 3bb4366006 ...

am: a3a56ab9d1

Change-Id: Id5e39a35db803223a89100a8e23a7b3309cd9dd3

2016-06-08 17:23:34 +00:00

..

current.txt

Merge \\"ShortcutManager: deal with changing resource IDs on app update\\" into nyc-mr1-dev am: 3bb4366006

2016-06-08 17:23:34 +00:00

removed.txt

resolve merge conflicts of 0c26c32 to master

2016-06-03 15:00:10 -06:00

system-current.txt

Merge \\"ShortcutManager: deal with changing resource IDs on app update\\" into nyc-mr1-dev am: 3bb4366006

2016-06-08 17:23:34 +00:00

system-removed.txt

resolve merge conflicts of 0c26c32 to master

2016-06-03 15:00:10 -06:00

test-current.txt

Merge \\"ShortcutManager: deal with changing resource IDs on app update\\" into nyc-mr1-dev am: 3bb4366006

2016-06-08 17:23:34 +00:00

test-removed.txt

resolve merge conflicts of 0c26c32 to master

2016-06-03 15:00:10 -06:00