OSDN Git Service

Merge "Allow for activities to resumed if keyguard is occluded." into pi-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Tue, 13 Mar 2018 19:37:25 +0000 (19:37 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 13 Mar 2018 19:37:25 +0000 (19:37 +0000)

Trivial merge