tree fcfa237968610ca2d573cbfc2695498e26bb90f3
parent 908b391a9c006af569dfaff08b37f8fdd6c4da89
parent 3d291a68463df7fb875a08f12cc39761a8e351f0
author Bob Badour <bbadour@google.com> 1560312654 -0700
committer android-build-merger <android-build-merger@google.com> 1560312654 -0700

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

Change-Id: I46f9f39a91a62fc7f16313b156256de9e3963c32