tree 4be5b1def35462fffa85294e55c76cdb97d1763f
parent 2d52390ac96678986288183d7f5ae7a18cee2131
parent b6fc18aa28e087806b3f83bb770d0f8eac37ff72
author Makoto Onuki <omakoto@google.com> 1463509100 +0000
committer android-build-merger <android-build-merger@google.com> 1463509100 +0000

Merge "ShortcutDemo: changes for DR API update." into nyc-mr1-dev
am: b6fc18aa28

* commit 'b6fc18aa28e087806b3f83bb770d0f8eac37ff72':
  ShortcutDemo: changes for DR API update.

Change-Id: Iddc9c0a315acf7220d90f80f77aa22b944e2ae48