tree cfd3ef6a34845a9e404d59a84507e4c2b064b6a1
parent 79db6186ae4381e3d823b5705aaa9addb026fb84
parent 5b93a5e61669b891ef07468f9527e549e6fcda59
author Makoto Onuki <omakoto@google.com> 1463074405 +0000
committer android-build-merger <android-build-merger@google.com> 1463074405 +0000

Merge "Remove ShortcutManager samples from nyc-dev" into nyc-dev am: 29e02b117d  -s ours
am: 5b93a5e616

* commit '5b93a5e61669b891ef07468f9527e549e6fcda59':

Change-Id: Iddbeea1253dd4c6d4092d8a915307132f44d81bd