tree a2b7509cbfbd906ab7ce87954373192a04f6c666
parent 926440847f9eac3fc7274d17580c5bd5b68727ba
parent 5e4eb524226fb9a9c17838cfafc834059a00b3af
author Bob Badour <bbadour@google.com> 1560380807 -0700
committer android-build-merger <android-build-merger@google.com> 1560380807 -0700

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

Change-Id: Idb11f8be1e893730036b8d48a4108ab87e78bb43