OSDN Git Service

Merge "Support multiple intents in ShortcutInfo" into nyc-mr1-dev
authorMakoto Onuki <omakoto@google.com>
Wed, 20 Jul 2016 23:05:29 +0000 (23:05 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 20 Jul 2016 23:05:31 +0000 (23:05 +0000)

Trivial merge