diff options
author | Selim Cinek <cinek@google.com> | 2015-06-26 15:26:06 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-26 15:26:08 +0000 |
commit | eb4ce1d6a3bfa99ec57604aa842835a381616346 (patch) | |
tree | 236e63ca0e023eaeaf1ed53483a0f4dc8b946dc2 /core/java/android/widget/TextView.java | |
parent | a2e0dc4d20be14ea106b44067cc782774d90df3b (diff) | |
parent | 2a46d6857172e6f9dfedb150f7eda8dba65eaf91 (diff) | |
download | frameworks_base-eb4ce1d6a3bfa99ec57604aa842835a381616346.zip frameworks_base-eb4ce1d6a3bfa99ec57604aa842835a381616346.tar.gz frameworks_base-eb4ce1d6a3bfa99ec57604aa842835a381616346.tar.bz2 |
Merge "Now showing unlocked icon if both trusted and fingerprint running" into mnc-dev
Diffstat (limited to 'core/java/android/widget/TextView.java')
0 files changed, 0 insertions, 0 deletions