tree f81dc1c1ece7b9c9c08b90345aa4c10293be9deb
parent 1a875d78a7cc496cfd7c51ef3faa146ddfc1e70e
parent 6a5a17b77bca5e70417746fd0616db3849731619
author Dan Willemsen <dwillemsen@google.com> 1554842045 +0000
committer Dan Willemsen <dwillemsen@google.com> 1554842121 +0000

Merge branch 'aosp/upstream-master'

Includes android-required NOTICE/MODULE_LICENSE*/METADATA files.

Test: treehugger
Change-Id: Ie31d99425f7c8d907c0284a68e385bdde009464c