commit | c07a7518d6bfd85fcc1ad15e72cf0fe8014ef0d0 | [log] [tgz] |
---|---|---|
author | Makoto Onuki <omakoto@google.com> | Mon Jun 20 21:15:26 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Jun 20 21:15:26 2016 +0000 |
tree | 6485cf67714903175136ecfa712664bcd9d448be | |
parent | b933c4d65c83bdd4925e678fc04da54e61dcb18f [diff] | |
parent | 901c03faba8c73194e694222477ce8d2c594d324 [diff] |
Merge \"Launcher shortcut callback should deliver manifest shortcuts too\" into nyc-mr1-dev am: 901c03faba Change-Id: Iaccb15163fd5b795adced796ede0a56e30a544a3