tree 870f96ef0d106c2f411d7f27025d86e87e48e350
parent 18f68dd466046828e3c81b17decdbb02489c86e2
parent a3d8cdca997e0577bcb1d9091880a0267e2d3f38
author Makoto Onuki <omakoto@google.com> 1459354656 +0000
committer android-build-merger <android-build-merger@google.com> 1459354656 +0000

Merge "ShortcutManager: Support secondary text field." into nyc-dev am: ca0ee28
am: a3d8cdc

* commit 'a3d8cdca997e0577bcb1d9091880a0267e2d3f38':
  ShortcutManager: Support secondary text field.

Change-Id: I5262a756c5fe50e498192aea8e247f46d5742edc