diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-15 17:34:53 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-15 17:34:53 +0000 |
| commit | 2d03b096e5232c4d65b496f5e916e803274ba03f (patch) | |
| tree | 7cae9ca4ed41cae18f87a4d5a88c3c6b139ad074 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 1790048aaceafc391f6f8385fa2b3d7b8883cc8e (diff) | |
| parent | 1888f7c50d65f77a96207984112b2ef7d373dc83 (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: e23bf50171 -s ours am: d00097533f -s ours" into rvc-qpr-dev-plus-aosp am: 1888f7c50d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12156611
Change-Id: I8ec609b8aefecffff1ac1b16c4090952dad6873b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions