[automerger skipped] Merge "Move media provider related hidden API flag file entries to packages/providers/MediaProvider" am: 0a0f645011 am: e02115712f -s ours am: 66f15ea9d7 -s ours am: 5278294b0c -s ours

Browse Source

am skip reason: Merged-In I0615b68715de2bb953da27b60d29d37b2750d86b with SHA-1 dd7640795c is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1769686

Change-Id: Iaadbe2360206dacb6df388e8e2719d02c901e30d

...

This commit is contained in:

Paul Duffin

2021-07-17 12:30:59 +00:00

committed by Automerger Merge Worker

parent 3180134fb0 5278294b0c

commit 49d42e40bd

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