tree e0c4007d576b0574dfee97e6a5becf2e57d45b99
parent 69c4b95102b4b9862bfba68b3eaf5b7537a705ee
parent 616a4bd404156d6a1ce8a368202cb04916007e6b
author Bob Badour <bbadour@google.com> 1560270753 -0700
committer android-build-merger <android-build-merger@google.com> 1560270753 -0700

Merge "Clarify license terms for Romain Guy's artwork." am: dbc4a43cd9 am: d99cce0a4e am: defbc032e6
am: 616a4bd404

Change-Id: I9e2fe8cf186ff628fbfec255a583a519fb1d3277