diff options
author | Chris Wren <cwren@android.com> | 2015-08-25 14:10:20 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-25 14:10:20 +0000 |
commit | 83d83194c3e68740593800ee2c295247d2bf2e06 (patch) | |
tree | cc4de3f837e1d7f31f1e07e42a1a9cc939402c00 /packages/SettingsLib/res/values-ca/strings.xml | |
parent | 2cb7004928e4bb34022e3ced112c2917fc5362f9 (diff) | |
parent | 9521231031543c1687c736d17d5bad989a6bc2de (diff) | |
download | frameworks_base-83d83194c3e68740593800ee2c295247d2bf2e06.zip frameworks_base-83d83194c3e68740593800ee2c295247d2bf2e06.tar.gz frameworks_base-83d83194c3e68740593800ee2c295247d2bf2e06.tar.bz2 |
Merge "instrument fingerprint crypto token service" into mnc-dr-dev
Diffstat (limited to 'packages/SettingsLib/res/values-ca/strings.xml')
0 files changed, 0 insertions, 0 deletions