tree b051820819acd041667fed788704f5022552c7c1
parent b9d45f84cb4ee9997a25291a8da76b278de2c525
parent 40e7c05440583f229edd6b6ca05c5d97b66fcf15
author Haibo Huang <hhb@google.com> 1553879361 -0700
committer Haibo Huang <hhb@google.com> 1553880906 +0000

Merge remote-tracking branch 'aosp/upstream-master' into master

Also adds NOTICE, METADATA, MODULE_LICENSE_*

Test: NA (not build yet)
Change-Id: Ia08a651fdecc5e540c2cad218a128099c7322280