commit | b3ff4ac6827bb6038d36ee709dc7b3a07219e1db | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Feb 16 16:35:39 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Feb 16 16:35:39 2021 +0000 |
tree | 4987876b93005c7eb84b8173e796d28ba16ee657 | |
parent | 7e24b8beff4d4167183881f2e62831aba405c2a1 [diff] | |
parent | 70d6495d4d8bbce3dfd2eff09d7479ed20c280b0 [diff] |
[automerger skipped] Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am: fcf6560011 am: fc00dda2e9 -s ours am: 70d6495d4d -s ours am skip reason: Change-Id I6e9103c3275cb2e6df5dc586588eccd7d2ab6b06 with SHA-1 47bc43a414 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1588961 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0dcff72fd2a921e9e781acd5ffbb19a8a6a7c98c