| commit | e5fa405609b2ada7d7fecbb1021703c6638d9a39 | [log] [tgz] |
|---|---|---|
| author | Jason Chiu <chiujason@google.com> | Thu Apr 06 18:27:25 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 06 18:27:25 2023 +0000 |
| tree | 8365ccad64d0f052b4800c32008257f6712bc3b5 | |
| parent | c364a011ec75d38ceed58f5a62b679cb38e3a801 [diff] | |
| parent | f133736e6c6f31054525df29530933fcb2d4b2be [diff] |
[automerger skipped] [resolved conflict] Refine permission check process of 2-pane deep link am: 0f13f70655 am: 5d50556ce2 -s ours am: f133736e6c -s ours am skip reason: Merged-In Ie69742983fb74ee2316b7aad16461db95ed927c2 with SHA-1 4f7205b2ea is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22505800 Change-Id: I4bafcdad13776f705b0a80380a06249bd88a424c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>