| commit | f98cfff495511c9554b17f8516ebed12e7c4c801 | [log] [tgz] |
|---|---|---|
| author | Jason Chiu <chiujason@google.com> | Thu Apr 06 18:59:53 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 06 18:59:53 2023 +0000 |
| tree | 53c41cb3f1865014f8c6f562f3ec326eedd9bc9d | |
| parent | 7242e7bb862541d52235295d2bd777218248105c [diff] | |
| parent | e5fa405609b2ada7d7fecbb1021703c6638d9a39 [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: e5fa405609 -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: I08568549208788f413eeca7cda8214862f986da1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>