| commit | 6930ac95883c3a9e5040d3a3521a7df126d21370 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Fri Jan 07 18:16:20 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jan 07 18:16:20 2022 +0000 |
| tree | f2a363e857a27baa0223b199da50a4acee3ab574 | |
| parent | 9400843a91805e2fedb32bdb9af867dcab4664d7 [diff] | |
| parent | 5ef6e53bf5ae2e2224fcba3a15fe149ebc804ff2 [diff] |
[automerger skipped] Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" am: 75205dc6b3 -s ours am: 5ef6e53bf5 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1940736 Change-Id: I5a9ec3301f4d4649584a57abc8d3776ae2e78311