tree fcfa237968610ca2d573cbfc2695498e26bb90f3
parent 908b391a9c006af569dfaff08b37f8fdd6c4da89
parent 2f03004c181baf9d291a9bf992e1b444e83cd82d
author Bob Badour <bbadour@google.com> 1560313049 -0700
committer android-build-merger <android-build-merger@google.com> 1560313049 -0700

Merge "Clarify license terms for Romain Guy's artwork." am: 17b630aa20 am: ace7e51e19 am: 3d291a6846
am: 2f03004c18

Change-Id: I1eca7f36b9c0aa7038931799ec4b071929ce768d