summaryrefslogtreecommitdiffstats
path: root/core/java/android/security
diff options
context:
space:
mode:
authorGeoff Mendal <mendal@google.com>2015-06-03 17:22:05 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-03 17:22:07 +0000
commit4f31c07fdd5a9cc442e499d5500924330c2813ae (patch)
tree24daeea046addcc0fc0849722341ff8ce8033f43 /core/java/android/security
parent8c554b015e5c5b7393b5b099ddab046b834f44c9 (diff)
parent77100c2094d85b2e521ac928f747dec0e31e5550 (diff)
downloadframeworks_base-4f31c07fdd5a9cc442e499d5500924330c2813ae.zip
frameworks_base-4f31c07fdd5a9cc442e499d5500924330c2813ae.tar.gz
frameworks_base-4f31c07fdd5a9cc442e499d5500924330c2813ae.tar.bz2
Merge "Import translations. DO NOT MERGE" into mnc-dev
Diffstat (limited to 'core/java/android/security')
0 files changed, 0 insertions, 0 deletions