tree e29f73f635ba7c3fd84fb213e353cad6ae89ebea
parent cf8cfc4412cf295338faff3da9705b7228b7e77f
parent 2ff366a39a4c64f54151b56c9e14bfef269e5a35
author Adrian Roos <roosa@google.com> 1496880025 +0000
committer android-build-merger <android-build-merger@google.com> 1496880025 +0000

Merge "Keyguard: Increase clock size" into oc-dev
am: 2ff366a39a

Change-Id: I0369da0041d3d8bf001340e7e8f88a60894c2c7d