| commit | a7017ff97ad9250d0ad18062cc1705b5d0ffbcb1 | [log] [tgz] |
|---|---|---|
| author | Meng Wang <mewan@google.com> | Mon Feb 28 22:10:03 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Feb 28 22:10:03 2022 +0000 |
| tree | 5effd89f90d8baf024fe80722b95ee0cd015fe53 | |
| parent | ba319a8cea2404759352a759938798f571936e90 [diff] | |
| parent | b35654fb1460e49b5223edaa98acadda8ad411b8 [diff] |
[automerger skipped] [conflict] 5G opportunistic data config per-band. 2p: a990c6dab9 am: b35654fb14 -s ours am skip reason: Merged-In I4c6ab1febcf12c6a7e2ab3364bb720e81c58dae7 with SHA-1 84b8cd1168 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16932030 Change-Id: Ib250e6b684eba1484bbfbe19713ffd22ea6c77ac