tree 9540763a308d33806006c230406ecf422f346b50
parent 8c968172f31added8f10b74144eaec23ffffb846
author Bob Badour <bbadour@google.com> 1613168550 -0800
committer Bob Badour <bbadour@google.com> 1613168550 -0800

[LSC] Add LOCAL_LICENSE_KINDS to prebuilts/manifest-merger

Added SPDX-license-identifier-Apache-2.0 to:
  Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: Ie27091eee45079f40e0e9d54ccabedb37b15548b