| commit | ad9617efed3dce19b47c10f7e38edbe7bfdd31c8 | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Tue Jul 25 12:08:51 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jul 25 12:08:51 2017 +0000 |
| tree | b0289443fcfa26785e16a0842b187d39006e4fdd | |
| parent | 4e2a5778fa233543a9d05d8745818c8e069c6751 [diff] | |
| parent | c185915ede35fac7a3187f82304bb75254e8a6ee [diff] |
Merge "Merge "Keyguard: Remove fancy colon" into oc-dr1-dev am: 55bc522d0d am: efb7931967" into oc-mr1-dev-plus-aosp am: c185915ede Change-Id: If3ba0f0f9134504af39078c2f28ec0d8157d13e2