diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-07 01:49:53 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-07 01:49:53 +0000 |
| commit | edb1ed6461e7d2a9b5d772ad7e27b928800a6ff2 (patch) | |
| tree | 73faa5a2aaf7de3d9ab3ff4a8629fbb17572cd05 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 67c9be734f80d891b984a5d56e1b34ec0ed5e92c (diff) | |
| parent | 1bfde096c3fe0b36208f0a491744dc716b92883c (diff) | |
[automerger skipped] Merge changes from topic "am-8fe1bfad79f84157a29ab2e38769dd1e" into rvc-qpr-dev-plus-aosp am: 1bfde096c3 -s ours
am skip reason: Change-Id I7a240621267648ea54e7dc737ebc55bc665e39b6 with SHA-1 346eed7325 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13236923
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ifb9cc9164046f0003ae8ae1753ec731a0c78288a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions