commit | 4b22a2897d42bd1698a875f6ed2f86931d34feca | [log] [tgz] |
---|---|---|
author | Bob Badour <bbadour@google.com> | Wed Jun 05 21:54:45 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Wed Jun 05 21:54:45 2019 -0700 |
tree | a8aa7440d00c53edac372f1e323a1dcaa4e32bd9 | |
parent | 902fd53c0b580a9fa2ddbf79714c9940068802ac [diff] | |
parent | a9791d0297d9b1e0a6d1c595244170d2ba469856 [diff] |
Merge "Merge "Clarify license terms for Romain Guy's artwork." am: 9f56d51018 am: 95736c9fb6 am: 36daa700a0" into qt-r1-dev-plus-aosp am: a9791d0297 Change-Id: Ia4726a50598aaf8eed32aedf1959030bd9b8a431