diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-19 15:47:14 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-19 15:47:14 +0000 |
| commit | fcf2e4370f63bb1409722ab057d252d691db07bf (patch) | |
| tree | 7f69384acaac3e5b33676fa3a0f5529b3a041e80 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | aed9d3454b777be58bce3bfefa9c7300ae56801d (diff) | |
| parent | 5cc7ee3f32345f4088025bfaa91b1545637a80dc (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: f6d4adeef4 -s ours am: 94ef8f65e4 -s ours am: 5accf14709 -s ours" into rvc-qpr-dev-plus-aosp am: 5cc7ee3f32 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12187283
Change-Id: I2dbbb36926238728742fa530aefe7d7c23cefea4
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions