tree a4d9febe9a06ff80bba061af5705fce878ca63a0
parent f5ee9c61be6dfc1a70d394906777654c231e39e3
parent 2a5ccebc1ee93356a2a2c9664e44f037d58c0716
author Bob Badour <bbadour@google.com> 1561680140 -0700
committer android-build-merger <android-build-merger@google.com> 1561680140 -0700

Merge "Clarify license terms for Romain Guy's artwork."
am: 2a5ccebc1e

Change-Id: I99502320bb087370796fc8f23500f1b82b070cbe