commit | 0c28c83ba5c402f0e69d0c556faee9f7ca131819 | [log] [tgz] |
---|---|---|
author | Jack Yu <jackyu@google.com> | Mon May 09 05:12:02 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon May 09 05:12:02 2022 +0000 |
tree | 1e2adc21ccd845fa62e2469434274fb39f45a22b | |
parent | 2ee623fbd53c870c83a447d190ca1982e913dc8a [diff] | |
parent | d5718c7c66ad03e511df525c07df41777717c58a [diff] |
[automerger skipped] Merge changes from topics "enterprise_internet", "set_data_enabled" am: 0d0729a62f am: d5718c7c66 -s ours am skip reason: Merged-In I6d09ade1650e226a965547e3f78e74f3f2ffec59 with SHA-1 c5a53c4125 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2091527 Change-Id: I4fdd2b1e8561854f89259225cabfb94a2214a6d8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>