tree c37d564ca87587c0e156dae39d996fe18c8ea76d
parent ecfe142948adf4f82083d7333b6c778f3993842b
parent bfdef872d30f0d56388db8d1aaf511efdd6c8360
author Treehugger Robot <treehugger-gerrit@google.com> 1588705035 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1588705035 +0000

Merge "Add METADATA to keymaster: Apache2=NOTICE" am: aaec3d66fe am: 5b3b21c6fb am: f7f0620488 am: b866dab36e am: bfdef872d3

Change-Id: Id1ab008df58e07a67374b8cdd78677d2871ba2d5