commit | d56a3c747bb47093c0f1d7b831cf461fd41088b6 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Mar 04 02:44:23 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Mar 04 02:44:23 2022 +0000 |
tree | de96401ddd7f95cfa8df11eea0601f336817212c | |
parent | bf9e179e5fb06b7398538235c997e7b7b99df30c [diff] | |
parent | 9761a09e1febfb72710762a361a50dd4f33b2e85 [diff] |
[automerger skipped] Merge changes from topics "data_retry", "setup_data" am: 29c90effd2 -s ours am: 9761a09e1f -s ours am skip reason: skipped by user jackyu Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2005015 Change-Id: I1d771e2dcd31ff9422b71f6f9c6a148006b226e5