Amith Yamasani 9f62bf9370 resolve merge conflicts of c33507d to nyc-mr1-dev-plus-aosp ...

am: b8ab1d3b12

Change-Id: I9f4879ae27560ade8fa4e6124908c3dced68feb1

2016-06-08 19:03:36 +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

resolve merge conflicts of c33507d to nyc-mr1-dev-plus-aosp

2016-06-08 19:03:36 +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