diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-23 21:17:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-12-23 21:17:14 +0000 |
| commit | bc260a6ef8b9b3f110ff4179b2da4aa0c5c65693 (patch) | |
| tree | 1ae36893ad26b5885bc78b2deb75d64813bbbf47 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 20ba0a3ea5f9908ac6661dbe2c9f0ce484ed24ef (diff) | |
| parent | 374fa7e0dc7f5c664d57d09d62a9e983b0422329 (diff) | |
Merge changes from topic "am-16cd9164212e4a1fbb9677984db72e08"
* changes:
[automerger skipped] Merge changes from topic "wifi_transport_info_stage_1" am: e126101fe6 am: 58c94eda42 am: 741b00a913 -s ours
[automerger skipped] Convert WifiInfo to TransportInfo am: 6c5626edfc am: 78111d5950 am: ad29f8165c -s ours
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions