diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-05 02:16:00 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-05 02:16:00 +0000 |
| commit | 1d638eabaf56fa33a6960aaaebf67e72577cfaa1 (patch) | |
| tree | 9a076411ea2a4756a226ce8b6ef000436b1e5e87 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | bd39b0abb4dc9670d9c408233bdacef400bc2ae5 (diff) | |
| parent | b827d75b916bfd5a9d802d03cfce738e4aeddeab (diff) | |
Merge "Merge "Add ThermalMitigation API to Telephony." am: 3c12991e94" into stage-aosp-master am: b827d75b91
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1510211
Change-Id: Iae1d19742999bcad97eef4bde1bd83450d18c6cd
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions