[automerger skipped] Merge "Parcel queriesProviders in ParsingPackageImpl" am: 8ee2b99d71 am: 131084c94a -s ours am: dd053819f3 -s ours

Browse Source

am skip reason: Change-Id I67219fe00c7b92677391fd46305bf0424d74e5f3 with SHA-1 985d71551d is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I897f66de3b74fca9ddd72da2b52f03f8c86db354

...

This commit is contained in:

Patrick Baumann

2021-03-03 20:23:08 +00:00

committed by Automerger Merge Worker

parent 306b326b6e dd053819f3

commit 3b9ec373ea

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