tree a6219da561ac98cfa3cdf9d1fb98cf15b5b28473
parent 9f95b3ec5dc976df1e44517c805b513583a7ee0f
parent 4500e02a8a33ec8defead90294a1d8fa6d538145
author Treehugger Robot <treehugger-gerrit@google.com> 1588122516 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1588122516 +0000

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

Change-Id: I548cc564cbc6fbc10fad6e3c53c80af372a19a3b