[automerger skipped] Merge "Override 2 getSliceUri() instance to return platform slice" am: f116c5fae7 am: a9a69c6aa3 -s ours am: 17a4871845 -s ours

Browse Source

am skip reason: Change-Id I3f9c8202d9b75b24b80ebcf385abc95f8df851e2 with SHA-1 ec81d6121e is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1394548

Change-Id: I16c99ac5fe38cb7391858d02abd4b21539d6d032

...

This commit is contained in:

Bonian Chen

2020-08-11 08:57:21 +00:00

committed by Automerger Merge Worker

parent 41a77501c3 17a4871845

commit 6e8d241cd9

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available