tree bd330d83c845a01023ae053004b4bdb201b33684
parent 92028aeb7948ec9588ca3f986e9fa46c71f92cbb
parent 0a15cd4ba08b309eb0f7e10b707a482068b480df
author Makoto Onuki <omakoto@google.com> 1472586895 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1472586896 +0000

Merge "Backport shortcut manager test utilities to DR" into nyc-dr1-dev