summaryrefslogtreecommitdiff
path: root/PermissionController/res
diff options
context:
space:
mode:
author Bill Yi <byi@google.com> 2019-05-25 13:38:17 -0700
committer android-build-merger <android-build-merger@google.com> 2019-05-25 13:38:17 -0700
commit6185ea85b1fcae385a33b2c2ed4733a8ed33762d (patch)
tree4532126cf31b40925d661aa686b15e8d0f4b3f1b /PermissionController/res
parent1e9fd29ee31187ffd39fad714305e6638c77547e (diff)
parent15ec3ab75210d436f19245c25053ff6637f429a1 (diff)
[automerger skipped] Import translations. DO NOT MERGE am: 80f315391a -s ours
am: 15ec3ab752 -s ours am skip reason: subject contains skip directive Change-Id: If8bbdd9917d66a96be84ca91cb45d24f0c7db121
Diffstat (limited to 'PermissionController/res')
0 files changed, 0 insertions, 0 deletions