tree dcf5abbc1c25271bd26f49fb02b9e63353e4640c
parent 0bc008557fef6b2193fb4950236f03c86862879b
parent 04efe9e5ff56ff6c4db6fe7eb4c35acb5b6f61ac
author Makoto Onuki <omakoto@google.com> 1457719561 +0000
committer android-build-merger <android-build-merger@google.com> 1457719561 +0000

Merge "Test for ShortcutManager.updateShortcuts(), also" into nyc-dev
am: 04efe9e5ff

* commit '04efe9e5ff56ff6c4db6fe7eb4c35acb5b6f61ac':
  Test for ShortcutManager.updateShortcuts(), also