| commit | 5d3be10949ba3019d56aae34f9035d47d1103a9b | [log] [tgz] |
|---|---|---|
| author | Zoey Chen <zoeychen@google.com> | Thu Aug 26 11:38:27 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 26 11:38:27 2021 +0000 |
| tree | a94284112337e2a254e0d0c510c56fd9fc2ff4c4 | |
| parent | 010395c25725ec919741f0e1d116fd51c2d5ddb2 [diff] | |
| parent | 1cacbc465bd1e2e509009b4c2f4e6d89742ce5b7 [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 skip reason: skipped by user zoeychen Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15611701 Change-Id: I4767df6977e2271310264735ecc99122d4c47350