tree 3ddb11d16e381a6255a2ad3a9a0256abb320e41b
parent 74f860b50924714be2bc787af90940ad52af8abd
parent 2b0cef9401b57d6e98103290dee26755e511a455
author Adrian Roos <roosa@google.com> 1500984053 +0000
committer android-build-merger <android-build-merger@google.com> 1500984053 +0000

Merge "Keyguard: Remove fancy colon" into oc-dr1-dev am: 55bc522d0d
am: 2b0cef9401

Change-Id: I29801a940a62d37cad0ed03ee4cf85a80096266e