OSDN Git Service

Merge "Fixed keyguard inflation problem" into oc-mr1-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Mon, 11 Sep 2017 23:43:51 +0000 (23:43 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 11 Sep 2017 23:43:51 +0000 (23:43 +0000)

Trivial merge