OSDN Git Service

Merge "Fix flakey shortcut manager tests."
authorMakoto Onuki <omakoto@google.com>
Mon, 18 Dec 2017 02:36:47 +0000 (02:36 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 18 Dec 2017 02:36:47 +0000 (02:36 +0000)

Trivial merge