diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2021-05-14 07:26:47 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-14 07:26:47 +0000 |
| commit | eb84dceae33678f7dd8bb972eb353c4bdc3f9946 (patch) | |
| tree | f125284d7a89877a6426f1e021aee56e54c910dd /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 3699f612ff0a36c05a0e37598d264c691cfd3a45 (diff) | |
| parent | 89b5529da3134d9e3b9a06d205ec3fdb02ed78b0 (diff) | |
[automerger skipped] Merge "Move NetIdManager, ProfileNetworkPreferences" am: e0316b6018 am: d461929832 am: 89b5529da3 -s ours
am skip reason: Merged-In I454e8a0a8d0e0f9e6d21a8e8faf5a9e299962ad4 with SHA-1 5625b1f3c6 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705549
Change-Id: I15d4f795062ca5f44b9291e14c96e7fa6890e98a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions