tree 1a7b303ecceee9078e036843f95846d86420ccd4
parent 316b9ecdcf5a9cebe8e46cb0ae46dc81c35d4cb8
parent 6f7362d92573e4ae693bc513dca586d6a4eb087b
author Makoto Onuki <omakoto@google.com> 1457460063 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1457460065 +0000

Merge "Introducing ShortcutManager" into nyc-dev