tree 4b4145fde73e3836e0619063e9678307e910c7d3
parent 4d55281b08011f8f75fea65710c8edfef17a5bed
parent 22fcc68e6be0edaa98f3dacf79d580a5e5d50005
author Makoto Onuki <omakoto@google.com> 1464369711 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1464369713 +0000

Merge "ShortcutManager: Support manifest shortcuts" into nyc-mr1-dev