diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-04-22 19:34:29 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-22 19:34:29 +0000 |
commit | abed9825c42ffa9bf77f1a7266dbe3a7b5e12571 (patch) | |
tree | 46722e29358f6eb0eb8b41b870086e52cc440409 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | b4ffd38e63e7c33e7c2cb18526349399f6b79b14 (diff) | |
parent | 1cb2c100e5c2f0134294391045bda3c734aadd3c (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 1cb2c100e5 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684926
Change-Id: I25b8e4a3383a2baf7ffd7b182a3a6cddd9b08f1c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions