Makoto Onuki 02f355df6b Merge \"Merge \\"Shortcut Manager: Address API council feedback and fix TODOs\\" into nyc-mr1-dev am: 3c67b3e47c\" into nyc-mr1-dev-plus-aosp ...

am: 24c52732d7

Change-Id: Ib54aff79c823b6819d94ef0ef6194e4541bf734f

2016-06-22 00:55:32 +00:00

..

current.txt

Merge \"Merge \\"Shortcut Manager: Address API council feedback and fix TODOs\\" into nyc-mr1-dev am: 3c67b3e47c\" into nyc-mr1-dev-plus-aosp

2016-06-22 00:55:32 +00:00

removed.txt

resolve merge conflicts of 0c26c32 to master

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

system-current.txt

Merge \"Merge \\"Shortcut Manager: Address API council feedback and fix TODOs\\" into nyc-mr1-dev am: 3c67b3e47c\" into nyc-mr1-dev-plus-aosp

2016-06-22 00:55:32 +00:00

system-removed.txt

resolve merge conflicts of 0c26c32 to master

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

test-current.txt

Merge \"Merge \\"Shortcut Manager: Address API council feedback and fix TODOs\\" into nyc-mr1-dev am: 3c67b3e47c\" into nyc-mr1-dev-plus-aosp

2016-06-22 00:55:32 +00:00

test-removed.txt

resolve merge conflicts of 0c26c32 to master

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