tree 3fa4fae8d9729fbedaa02c410da5648c14c38978
parent abfa62f80b64e1447c05ff3d2f8294da7eb75119
parent 4b06a33f7b5357933e09103db6b383c2848870d4
author Treehugger Robot <treehugger-gerrit@google.com> 1613598392 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1613598392 +0000

Merge "pm: Require manifest.json for .dm (dex-metadata) files." am: 3ad85e407e am: 4b06a33f7b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If5333980d2af4d3d703fc7bbf1545214697c9841