commit | f0034b390f5e96f8d91806ae3596666a4eba19ec | [log] [tgz] |
---|---|---|
author | Adrian Roos <roosa@google.com> | Tue Jul 25 12:00:53 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jul 25 12:00:53 2017 +0000 |
tree | 3ddb11d16e381a6255a2ad3a9a0256abb320e41b | |
parent | 74f860b50924714be2bc787af90940ad52af8abd [diff] | |
parent | 2b0cef9401b57d6e98103290dee26755e511a455 [diff] |
Merge "Keyguard: Remove fancy colon" into oc-dr1-dev am: 55bc522d0d am: 2b0cef9401 Change-Id: I29801a940a62d37cad0ed03ee4cf85a80096266e