summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/res/values-ca
diff options
context:
space:
mode:
authorRobin Lee <rgl@google.com>2015-01-07 12:41:44 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-07 12:41:44 +0000
commit23bb3f11cbe4ca64337b5b75c333ea891760213f (patch)
tree647cdbf0270523a8fd9bcb04bdb5db786d676aff /packages/SystemUI/res/values-ca
parent4e2986940b2ff456693a805026c6910e950c42e2 (diff)
parent26e2da8ff8bdd577c915620c93805f21ff1fd65e (diff)
downloadframeworks_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