tree 38b43f73b40d4bf85e768d84f1b946bfd3931d49
parent 3b6e3b22d7c9cbfc069e4fdcb760f509a7ebab2a
parent 0c433f112a24c7347a2c6337651eb59414e418a9
author Makoto Onuki <omakoto@google.com> 1469813312 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1469813370 +0000

Merge "ShortcutManager negative CTS" into nyc-mr1-dev