diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-25 00:29:23 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-25 00:29:23 +0000 |
| commit | 169e13233066afc8b7702ef888cf53969c6a9709 (patch) | |
| tree | cc1c19805e08faaaa7c19858ec01ee9e331da2ca /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | da0c68d0008df45fdcf5f773a646790f26573546 (diff) | |
| parent | 4970e694716a3d436e42b2fa2f61d169b89a62f5 (diff) | |
[automerger skipped] Merge "Redesign the setPreferredNetworkType" am: 53b272d680 am: c64805d392 am: 4970e69471 -s ours
am skip reason: Change-Id Ia257e6ddaa33c32bc09340a59c9daf71ce1fa8cf with SHA-1 d11c1218d5 is in history
Change-Id: I9b9129bf5e20aa5bbfcdc62cb1d17a1969a1c3fc
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions