| commit | aaf2ad7738a4288aa5db4a4da4e62af52a1e15ca | [log] [tgz] |
|---|---|---|
| author | Hugh Chen <hughchen@google.com> | Thu Jan 07 05:18:27 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jan 07 05:18:27 2021 +0000 |
| tree | 2ff178f21f45dc294dd98a8c58ba8c30aca490d2 | |
| parent | 50ab9ab26a61d52a2e5ba119011ecdf3835c92bf [diff] | |
| parent | 18c06480b0a4e22dc8ab7bb817b14044de0f1deb [diff] |
[automerger skipped] DO NOT MERGE: resolve merge conflicts of c17ec818af7159f4fd678dab3bbad7ef308a7be4 to rvc-qpr-dev am: 18c06480b0 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13294249 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic6e7de3bd526b0419f6fc1513bbc040e44982b0d