diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-06-30 20:23:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-30 20:23:51 +0000 |
| commit | e6d7573cb82db89bbb9760a61c8d291642a291b1 (patch) | |
| tree | d4e8de5c1e9662dc38c01966bb33d5b1b08dcd83 /tools/aapt2/diff/Diff.cpp | |
| parent | 5f47a3765d3bf82fc54a39de47f3be78b4a213ef (diff) | |
| parent | d4eb3a125da6c98e2fd3dd5368222b4abd02116b (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: d4eb3a125d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15157601
Change-Id: I65b7207cf7eac26e098c45ba54d4d6b3fd4e32c2
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions