[automerger skipped] Merge "Add interface and extend db to support storing slice uris" am: 5c4154b2e4 am: 6cc261d709 -s ours am: e8c233c4dc -s ours am: 41a77501c3 -s ours

Browse Source

am skip reason: Change-Id Ie81e69477d297aa96a0daad02d56196c956271a3 with SHA-1 225da1517c is in history

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

Change-Id: I0d12957f0e00665646d7be0b1d919033450d7fbc

...

This commit is contained in:

Bonian Chen

2020-08-11 03:35:42 +00:00

committed by Automerger Merge Worker

parent 326ed12f4c 41a77501c3

commit cb6df05e95

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