diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-05 22:11:03 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-05 22:11:03 +0000 |
| commit | 53179c98df49fabf049fb76460332f01723aa579 (patch) | |
| tree | d3aae18ea1e1092585182efd404fb86d0cbda374 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | fb5c7f5b003a7326501796cf95644f49ebaf4b93 (diff) | |
| parent | 1d638eabaf56fa33a6960aaaebf67e72577cfaa1 (diff) | |
[automerger skipped] Merge "Merge "Add ThermalMitigation API to Telephony." am: 3c12991e94" into stage-aosp-master am: b827d75b91 am: 1d638eabaf -s ours
am skip reason: Change-Id Ib4be5edf063e4c54e9238b0403f59e1621df671e with SHA-1 30f372a774 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1510211
Change-Id: I79ce5c721275c3370bdc5550cad0a58fd8450547
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions