tree c9990fcff22771d1971678952ea40d20ddb3321c
parent 9acf33982573d696a85638c80c1fb8172893869c
parent c01f1cee705d0d521d62b586454e516d8993a4d8
author Bob Badour <bbadour@google.com> 1560381229 -0700
committer android-build-merger <android-build-merger@google.com> 1560381229 -0700

Merge "Clarify license terms for Romain Guy's artwork." am: 11d96c6de8 am: 3e4dd234e7 am: 5e4eb52422
am: c01f1cee70

Change-Id: I9a496629c12bec03ca1b28b1ffdd04f0584e6c75