tree 61ec383fec107b98f8c3adecdb172dba094d3886
parent 302d0d45d2bd6678ac052c11c8d64b9d3dbf2d6f
parent 3e4dd234e7f0275550849ae5162cdcbb658e16fa
author Bob Badour <bbadour@google.com> 1560380208 -0700
committer android-build-merger <android-build-merger@google.com> 1560380208 -0700

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

Change-Id: I5c2ec271babc92ac7bd46863fa03760e80afc170