diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-08-20 17:16:32 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-20 17:16:32 +0000 |
| commit | 3141524bb99b16809ae44806d46d50d8bdbbe146 (patch) | |
| tree | 68d9fc0269e32ad1f3e2e3b3834b55e7da616655 /tools/aapt2/format/binary/BinaryResourceParser.cpp | |
| parent | 4b77696e7cfa8722e623daeb147e184cb79464b6 (diff) | |
| parent | 7ce72c88da36ece97c00b0796c83a5b5a14d3ab6 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 0642f54f64 -s ours am: 7ce72c88da -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12416140
Change-Id: If668438b5a3d120178b77fec6d94239c4a6636b9
Diffstat (limited to 'tools/aapt2/format/binary/BinaryResourceParser.cpp')
0 files changed, 0 insertions, 0 deletions