commit | 1cacbc465bd1e2e509009b4c2f4e6d89742ce5b7 | [log] [tgz] |
---|---|---|
author | Zoey Chen <zoeychen@google.com> | Thu Aug 26 11:07:28 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 26 11:07:28 2021 +0000 |
tree | ac2271587f5eb56be407baf1c3c6c05a531705aa | |
parent | 87515007a06692a307137e7cc91f638d9baddc04 [diff] | |
parent | c6691520b1ff70fe1687789434a95bd8c0078700 [diff] |
[automerger skipped] Merge changes from topics "launch_wifi_details-sc-qpr1-dev", "refactor_icon_injector-sc-qpr1-dev" into sc-qpr1-dev am: c6691520b1 -s ours am skip reason: skipped by user zoeychen Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15611701 Change-Id: I6876f80d439910c3d7a9e38117c9356b6285fc0a