tree 658085ba8fb088d79f309b995e31a3e03e272a60
parent 9505b78e29ec8b5b67e81742b70c666db60c87ff
parent 06517019303eca3053ce8670d022b00e67e46ebd
author Makoto Onuki <omakoto@google.com> 1468259667 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1468259667 +0000

Merge "Restore "reset ShortcutManager rate limiting" dev option" into nyc-mr1-dev