tree 689e58c6a56a7bece0959e15050ead3fcaa6a587
parent 0f7fe1798359de050b0e20cdeed469760317b920
parent a49bafad6b4d0f8403edcd794e69d27d8befccb7
author Makoto Onuki <omakoto@google.com> 1471995843 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1471995846 +0000

Merge "Backporting shortcut manager test utils to mr1" into nyc-mr1-dev