OSDN Git Service

Merge "Show work unlock prompt on focus as well as touch"
authorTreeHugger Robot <treehugger-gerrit@google.com>
Wed, 11 Jan 2017 20:38:54 +0000 (20:38 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 11 Jan 2017 20:38:58 +0000 (20:38 +0000)

Trivial merge