diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-21 19:48:29 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-21 19:48:29 +0000 |
| commit | ccaa8826ebe3738883d799232e32a139a95f3b05 (patch) | |
| tree | 87e6368a302cfcc82d4e58589fe9197a9cf31989 /tools/aapt2/java/ProguardRules_test.cpp | |
| parent | 68cb6cca98b81fb85ee310909a381ee896eaf1b5 (diff) | |
| parent | 8bf888c7e9fc35136769dffc0c9fbb97af51c4c5 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 8bf888c7e9 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12198207
Change-Id: I0589611387896a589c1ee9f3fe3a5bfb0489cf9a
Diffstat (limited to 'tools/aapt2/java/ProguardRules_test.cpp')
0 files changed, 0 insertions, 0 deletions