tree d206ba0c5a17610e14e3594de4d4aa06b72825eb
parent 0d48acccb283e93f935d5c70248acd1a82129179
parent 6d48ba4dd43861ecb910d8ba83a9611be94dd890
author Makoto Onuki <omakoto@google.com> 1470170417 +0000
committer android-build-merger <android-build-merger@google.com> 1470170417 +0000

Merge "Shortcut launcher demo:" into nyc-mr1-dev
am: 6d48ba4dd4

Change-Id: Id821fb2ba6bfbc731073e28203f7431762c66df8