| commit | eb4ce1d6a3bfa99ec57604aa842835a381616346 | [log] [tgz] |
|---|---|---|
| author | Selim Cinek <cinek@google.com> | Fri Jun 26 15:26:06 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jun 26 15:26:08 2015 +0000 |
| tree | 236e63ca0e023eaeaf1ed53483a0f4dc8b946dc2 | |
| parent | a2e0dc4d20be14ea106b44067cc782774d90df3b [diff] | |
| parent | 2a46d6857172e6f9dfedb150f7eda8dba65eaf91 [diff] |
Merge "Now showing unlocked icon if both trusted and fingerprint running" into mnc-dev