tree 27a3541dc77e80c226ca6a8fb80709eb565b299c
parent f8fa0e96f5b4851ddd164bd99964955f5fa17df4
parent 3f57de2fbe951640b587d9c2d503daf554747749
author Dan Willemsen <dwillemsen@google.com> 1554841835 +0000
committer Dan Willemsen <dwillemsen@google.com> 1554841931 +0000

Merge branch 'aosp/upstream-master'

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

Test: treehugger
Change-Id: Ia1c1b002f10d7c9ff37aa47df44e4d8edc041879