diff options
author | Robin Lee <rgl@google.com> | 2015-01-07 12:41:44 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-07 12:41:44 +0000 |
commit | 23bb3f11cbe4ca64337b5b75c333ea891760213f (patch) | |
tree | 647cdbf0270523a8fd9bcb04bdb5db786d676aff /packages/SystemUI/res/values-ca | |
parent | 4e2986940b2ff456693a805026c6910e950c42e2 (diff) | |
parent | 26e2da8ff8bdd577c915620c93805f21ff1fd65e (diff) | |
download | frameworks_base-23bb3f11cbe4ca64337b5b75c333ea891760213f.zip frameworks_base-23bb3f11cbe4ca64337b5b75c333ea891760213f.tar.gz frameworks_base-23bb3f11cbe4ca64337b5b75c333ea891760213f.tar.bz2 |
am 26e2da8f: am 374c358d: Merge "Profile owner hint in warning for extra CAs" into lmp-mr1-dev
* commit '26e2da8ff8bdd577c915620c93805f21ff1fd65e':
Profile owner hint in warning for extra CAs
Diffstat (limited to 'packages/SystemUI/res/values-ca')
0 files changed, 0 insertions, 0 deletions