commit | efa809eea0f24cc10b4ec127642fc0f41a054ec6 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Feb 17 22:28:34 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Feb 17 22:28:34 2021 +0000 |
tree | 8296eefc9cd19c100a5d715b696a85ec60a77f7c | |
parent | d9e4faebe8ddfc4ffb1d720dd58397815dec5786 [diff] | |
parent | 94e09fbe6a0e64e1bf202692b7ea05a450925854 [diff] |
[automerger skipped] Merge "pm: Require manifest.json for .dm (dex-metadata) files." am: 3ad85e407e am: 4b06a33f7b am: 94e09fbe6a -s ours 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