Makoto Onuki e7b5752c91 Merge "ShortcutManager: implement backup & restore" into nyc-dev ...

am: b1a684c

* commit 'b1a684c6461b2c316798dfd7bc91c7f39ee3c211':
  ShortcutManager: implement backup & restore

Change-Id: Id18fb8e6f4cae11086eb0aaee810d5a20ea0e678

2016-04-01 23:28:33 +00:00

..

android

Merge "ShortcutManager: implement backup & restore" into nyc-dev

2016-04-01 23:28:33 +00:00

google/android

…