diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-08-23 15:25:08 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-23 15:25:08 +0000 |
| commit | d2a77dfb237aa7f233ca1c0ca4d97f93d982c9d3 (patch) | |
| tree | 1f57c8a027ed8a45501d83ced5832a0867bbaf2e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 7916d908935e64c949b7606b4a8485f35d7a2335 (diff) | |
| parent | 40894a8ca5f2d10ebc7fc99874b8743f672c4e92 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 3481b309ec -s ours am: 858f22a9ad -s ours am: 40894a8ca5 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12430436
Change-Id: I7e9a5f53a1f09cf9bbd2e8bd721867334ffb332c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions