commit | c9111558244a4060bc5d6818b82d26e8616feb34 | [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 | b0353522b67eaf3af52aebb85d2b582a3daa449b | |
parent | 86becab99c47f979c4db5c9e134c4739395b4835 [diff] | |
parent | b0623ccf0365ac10ab4c8cf8ea98b4055495f097 [diff] |
[automerger skipped] Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am: fcf6560011 am: 63c79f8b66 -s ours am: b0623ccf03 -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