commit | a54840598b9534f8fc9c2e453273d8dc08a30b58 | [log] [tgz] |
---|---|---|
author | Zoey Chen <zoeychen@google.com> | Thu Aug 26 11:51:43 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 26 11:51:43 2021 +0000 |
tree | a264d0bd75ce777f4a980570261b6e9b65f4f8e5 | |
parent | 20ddcc7603be5146ae89e5c102a99204efca75dd [diff] | |
parent | 5d3be10949ba3019d56aae34f9035d47d1103a9b [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: 1cacbc465b -s ours am: 5d3be10949 -s ours am skip reason: skipped by user zoeychen Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15611701 Change-Id: I1457b970df3133d79c94ef23463e3b01ebb5a298