OSDN Git Service

Merge \"Support multiple intents in ShortcutInfo\" into nyc-mr1-dev
authorMakoto Onuki <omakoto@google.com>
Wed, 20 Jul 2016 23:09:55 +0000 (23:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 20 Jul 2016 23:09:55 +0000 (23:09 +0000)
commit9a6109f2845770021cf938b5b688c3868086347f
tree140b00f7a407e41f063387ed58a10c1b0665e385
parentc0bcb77315ca4a33c4b698d31025fe2d5f7663e6
parentb84ce2e034223e35726222230db3a12f991f76a6
Merge \"Support multiple intents in ShortcutInfo\" into nyc-mr1-dev
am: b84ce2e034

Change-Id: I53daa680bdf18505896a372e59c7b4bd73d4edca