tree 942316ad21089de096003cb3e36b27bb815ae60c
parent 33e1ca8aabe00158a7025be49f2f71ed88ecfc78
parent f648351379da9280a4f907ae92acb4e518a7bd4d
author Treehugger Robot <treehugger-gerrit@google.com> 1588774166 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1588774166 +0000

Merge "Add METADATA to development: Apache2+BSD+MIT+UNICODE+zlib+CC-BY=NOTICE" am: d8af1d3392 am: f648351379

Change-Id: I4d0e65e8b36d58ffe8997953c509b13d6594abc4