commit | 70d6495d4d8bbce3dfd2eff09d7479ed20c280b0 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Feb 16 15:56:35 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Feb 16 15:56:35 2021 +0000 |
tree | b996f75dc75a0aff787a4a17755f15b8cfc0d513 | |
parent | 057bac27245afbc29390f5529fb48ff617a75133 [diff] | |
parent | fc00dda2e9cf0c0d6acbe839a3007100d3400839 [diff] |
[automerger skipped] Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am: fcf6560011 am: fc00dda2e9 -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: I7396eb4c772714f142c2c1f3831efa533772159b