OSDN Git Service

Merge "Keyguard: Increase clock size" into oc-dev
authorAdrian Roos <roosa@google.com>
Wed, 7 Jun 2017 23:59:53 +0000 (23:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 7 Jun 2017 23:59:53 +0000 (23:59 +0000)
am: 2ff366a39a

Change-Id: I758d95a87400fe4643cd6cdb2c776de1975336b9


Trivial merge