tree e8cd24b37ee65afb1a669eea7e01aa9f3c9e1bfd
parent 229c8fdcd1ee08068bf2255f39246de7be6dbdf6
parent 89f3a6aa5becdad32951daf473e15f9ac08b41d9
author Makoto Onuki <omakoto@google.com> 1457569960 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1457569960 +0000

Merge "ShortcutDemo to call more APIs" into nyc-dev