diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-15 17:10:09 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-15 17:10:09 +0000 |
| commit | 4f15fb7f4ccb8870e3bf18a33886ad783a5cedb4 (patch) | |
| tree | 4c78b275630199841534948ff64a16a45ab61209 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 9cea4040ed9f530d2c82fb250563a77f12bdbdf8 (diff) | |
| parent | 505574f6ead91da73fbd6632cb1f7936a3deb10d (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 218b61acf4 -s ours am: 7b142fb0e4 -s ours am: 505574f6ea -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12156601
Change-Id: Ica300fee91fff34973dd27ec9cdf402e649974bc
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions