summaryrefslogtreecommitdiff
path: root/PermissionController/res
diff options
context:
space:
mode:
author Bill Yi <byi@google.com> 2019-05-25 13:39:54 -0700
committer android-build-merger <android-build-merger@google.com> 2019-05-25 13:39:54 -0700
commit4f4edb30be7cac401f9dda8c3cc87414af38b92c (patch)
treeb46a694219924d7c614bed5e51b44badbaec2eae /PermissionController/res
parentfd2c1a24a8225a7bf1d68c5a8f27b3296c934c11 (diff)
parent1e9fd29ee31187ffd39fad714305e6638c77547e (diff)
[automerger skipped] Import translations. DO NOT MERGE am: 80f315391a -s ours am: ee4bc5b3d2 -s ours
am: 1e9fd29ee3 -s ours am skip reason: subject contains skip directive Change-Id: Id7428f40f3c7d61797ec379ce97cb6b187618704
Diffstat (limited to 'PermissionController/res')
0 files changed, 0 insertions, 0 deletions