tree 257860670a8abe02583131f3f76920ea421074a0
parent b53c83e0aac07626f71ab213376df3d182ecbeb6
parent 1cdaca9f843297fbe4a91255ce79d630b002dd2a
author Bob Badour <bbadour@google.com> 1619133796 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1619133796 +0000

Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" into sc-dev