[automerger skipped] Merge "pm: Require manifest.json for .dm (dex-metadata) files." am: 3ad85e407e am: 4b06a33f7b am: 94e09fbe6a -s ours

Browse Source

am skip reason: Change-Id I7a3c442bb27da5948bc9ead146c77213de6b56cc with SHA-1 12af11d6f5 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I974e14f94aa3d3ffd07aff058d5777894cc71ad5

...

This commit is contained in:

Treehugger Robot

2021-02-17 22:28:34 +00:00

committed by Automerger Merge Worker

parent d9e4faebe8 94e09fbe6a

commit efa809eea0

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