tree cedd7c5bae07bc1d25e608901a013ab8bbd51fcc
parent e07065a4631c83d817321f7e4f5ce0d265fb5cd6
parent 8f02a7acb5455ab7e2eb02eb394eb149c59279c1
author Bob Badour <bbadour@google.com> 1611281413 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1611281413 +0000

Merge "Fix license_type. Contains BY-SA" am: a433f814ba am: 41617ade2b am: 8f02a7acb5

Original change: https://android-review.googlesource.com/c/platform/development/+/1556702

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0b61db6f8c89a102d02925de35a753b996c63cbc