tree 6a3ed5043e4c73534609ee0b3051aa3a627e262c
parent e6abcbed993c81562cddb4122235fc2bcffff8e8
parent ffa519c811b291befec1693a0724a282bc3af080
author Makoto Onuki <omakoto@google.com> 1513564607 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1513564607 +0000

Merge "Fix flakey shortcut manager tests."