tree a6219da561ac98cfa3cdf9d1fb98cf15b5b28473
parent 03703bd2ae8168fb3c003f272bff23f15a4875a0
parent d2f5901cebfd379cce5aebef843ebc21b7889cfd
author Treehugger Robot <treehugger-gerrit@google.com> 1588125718 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1588125718 +0000

Merge "Add METADATA to bsdiff: BSD+Apache2=NOTICE" am: 4500e02a8a am: c62b211329 am: cb25028daa am: d2f5901ceb

Change-Id: Ie4868bae28a932eee09594bc28fc61e9e70ecb2a