commit | aff5f4f697ba84887dc3020d8300d3dcbfb1d7d8 | [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 | 6bc18f7125101113fc6ad39f8c708c64b5ae140e | |
parent | a4ecb7bc721a07b6b1fb43cdbcd7f2c8661b8efe [diff] | |
parent | 2c4a992979a86261b41ef5497b17177855743655 [diff] |
[automerger skipped] Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am: fcf6560011 am: 2c4a992979 -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