tree efd148d2882b6dea32f3e615e1844517cfa0ea31
parent 69e24384a7bf4051ca30fdd1e1338fdfd0416cf4
parent 7a6a05f0ccc8c57496d0a1e2b0882ab7de3175e5
author Makoto Onuki <omakoto@google.com> 1457719216 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1457719218 +0000

Merge "Test for ShortcutManager.updateShortcuts(), also" into nyc-dev