commit | c185915ede35fac7a3187f82304bb75254e8a6ee | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <android-build-merger@google.com> | Tue Jul 25 12:03:12 2017 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jul 25 12:03:12 2017 +0000 |
tree | 3ddb11d16e381a6255a2ad3a9a0256abb320e41b | |
parent | f0034b390f5e96f8d91806ae3596666a4eba19ec [diff] | |
parent | 099d17e356815f2a734473adce70266bc798bc89 [diff] |
Merge "Merge "Keyguard: Remove fancy colon" into oc-dr1-dev am: 55bc522d0d am: efb7931967" into oc-mr1-dev-plus-aosp