diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-06 07:50:04 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-06 07:50:04 +0000 |
| commit | f1915245dbddea95bc9a95e141c2b4e6c9563d8b (patch) | |
| tree | 4ff56bde1d82e854b68b88e14125510cd2de0608 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | ef35a309706da06230886f35d73309ace52d515b (diff) | |
| parent | c3cc9152fc92e2c98d54365012e2b0877692c94a (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 90b0d3f83e -s ours am: 228aa6e038 -s ours am: 267e6ffd2c -s ours am: a7ce7c2bea -s ours am: c3cc9152fc -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420004
Change-Id: Ie070474dd950d6795e0392a2dfd33b17515ca8a0
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions