refs/heads/android11-qpr1-s2-release - platform/prebuilts/manifest-merger

commit	3b9fc994c7ec52c403a8d30ceb08ca29b3579c52	[log] [tgz]
author	Colin Cross <ccross@android.com>	Tue Aug 13 22:08:18 2019 -0700
committer	Colin Cross <ccross@android.com>	Tue Aug 13 23:30:08 2019 -0700
tree	e67f720984bacb763fa054c650e0163bf695e3e3
parent	c61778dd7fdef4194cf8592f9d4a7ead9bb16811 [diff]

Manually update manifest merger using gmaven_repo from ab/5794003

Bug: 139128472
Test: m checkbuild
Change-Id: I1e54186afca0843a1607b33465c37aece62f4522

Android.bp[diff]
com/android/tools/annotations/26.4.0-beta05/annotations-26.4.0-beta05.jar[Deleted - diff]
com/android/tools/annotations/26.4.0-beta05/annotations-26.4.0-beta05.jar.md5[Deleted - diff]
com/android/tools/annotations/26.4.0-beta05/annotations-26.4.0-beta05.jar.sha1[Deleted - diff]
com/android/tools/annotations/26.4.0-beta05/annotations-26.4.0-beta05.pom.md5[Deleted - diff]
com/android/tools/annotations/26.4.0-beta05/annotations-26.4.0-beta05.pom.sha1[Deleted - diff]
com/android/tools/annotations/26.6.0-dev/annotations-26.6.0-dev.jar[Added - diff]
com/android/tools/annotations/26.6.0-dev/annotations-26.6.0-dev.jar.md5[Added - diff]
com/android/tools/annotations/26.6.0-dev/annotations-26.6.0-dev.jar.sha1[Added - diff]
com/android/tools/annotations/26.6.0-dev/annotations-26.6.0-dev.pom[Renamed from com/android/tools/annotations/26.4.0-beta05/annotations-26.4.0-beta05.pom - diff]
com/android/tools/annotations/26.6.0-dev/annotations-26.6.0-dev.pom.md5[Added - diff]
com/android/tools/annotations/26.6.0-dev/annotations-26.6.0-dev.pom.sha1[Added - diff]
com/android/tools/annotations/maven-metadata.xml[diff]
com/android/tools/build/builder-model/3.4.0-beta05/builder-model-3.4.0-beta05.jar[Deleted - diff]
com/android/tools/build/builder-model/3.4.0-beta05/builder-model-3.4.0-beta05.jar.md5[Deleted - diff]
com/android/tools/build/builder-model/3.4.0-beta05/builder-model-3.4.0-beta05.jar.sha1[Deleted - diff]
com/android/tools/build/builder-model/3.4.0-beta05/builder-model-3.4.0-beta05.pom.md5[Deleted - diff]
com/android/tools/build/builder-model/3.4.0-beta05/builder-model-3.4.0-beta05.pom.sha1[Deleted - diff]
com/android/tools/build/builder-model/3.6.0-dev/builder-model-3.6.0-dev.jar[Added - diff]
com/android/tools/build/builder-model/3.6.0-dev/builder-model-3.6.0-dev.jar.md5[Added - diff]
com/android/tools/build/builder-model/3.6.0-dev/builder-model-3.6.0-dev.jar.sha1[Added - diff]
com/android/tools/build/builder-model/3.6.0-dev/builder-model-3.6.0-dev.pom[Renamed from com/android/tools/build/builder-model/3.4.0-beta05/builder-model-3.4.0-beta05.pom - diff]
com/android/tools/build/builder-model/3.6.0-dev/builder-model-3.6.0-dev.pom.md5[Added - diff]
com/android/tools/build/builder-model/3.6.0-dev/builder-model-3.6.0-dev.pom.sha1[Added - diff]
com/android/tools/build/builder-model/maven-metadata.xml[diff]
com/android/tools/build/builder-test-api/3.4.0-beta05/builder-test-api-3.4.0-beta05.jar[Deleted - diff]
com/android/tools/build/builder-test-api/3.4.0-beta05/builder-test-api-3.4.0-beta05.jar.md5[Deleted - diff]
com/android/tools/build/builder-test-api/3.4.0-beta05/builder-test-api-3.4.0-beta05.jar.sha1[Deleted - diff]
com/android/tools/build/builder-test-api/3.4.0-beta05/builder-test-api-3.4.0-beta05.pom.md5[Deleted - diff]
com/android/tools/build/builder-test-api/3.4.0-beta05/builder-test-api-3.4.0-beta05.pom.sha1[Deleted - diff]
com/android/tools/build/builder-test-api/3.6.0-dev/builder-test-api-3.6.0-dev.jar[Added - diff]
com/android/tools/build/builder-test-api/3.6.0-dev/builder-test-api-3.6.0-dev.jar.md5[Added - diff]
com/android/tools/build/builder-test-api/3.6.0-dev/builder-test-api-3.6.0-dev.jar.sha1[Added - diff]
com/android/tools/build/builder-test-api/3.6.0-dev/builder-test-api-3.6.0-dev.pom[Renamed from com/android/tools/build/builder-test-api/3.4.0-beta05/builder-test-api-3.4.0-beta05.pom - diff]
com/android/tools/build/builder-test-api/3.6.0-dev/builder-test-api-3.6.0-dev.pom.md5[Added - diff]
com/android/tools/build/builder-test-api/3.6.0-dev/builder-test-api-3.6.0-dev.pom.sha1[Added - diff]
com/android/tools/build/builder-test-api/maven-metadata.xml[diff]
com/android/tools/build/manifest-merger/26.4.0-beta05/manifest-merger-26.4.0-beta05-sources.jar[Deleted - diff]
com/android/tools/build/manifest-merger/26.4.0-beta05/manifest-merger-26.4.0-beta05-sources.jar.md5[Deleted - diff]
com/android/tools/build/manifest-merger/26.4.0-beta05/manifest-merger-26.4.0-beta05-sources.jar.sha1[Deleted - diff]
com/android/tools/build/manifest-merger/26.4.0-beta05/manifest-merger-26.4.0-beta05.jar[Deleted - diff]
com/android/tools/build/manifest-merger/26.4.0-beta05/manifest-merger-26.4.0-beta05.jar.md5[Deleted - diff]
com/android/tools/build/manifest-merger/26.4.0-beta05/manifest-merger-26.4.0-beta05.jar.sha1[Deleted - diff]
com/android/tools/build/manifest-merger/26.4.0-beta05/manifest-merger-26.4.0-beta05.pom.md5[Deleted - diff]
com/android/tools/build/manifest-merger/26.4.0-beta05/manifest-merger-26.4.0-beta05.pom.sha1[Deleted - diff]
com/android/tools/build/manifest-merger/26.6.0-dev/manifest-merger-26.6.0-dev-sources.jar[Added - diff]
com/android/tools/build/manifest-merger/26.6.0-dev/manifest-merger-26.6.0-dev-sources.jar.md5[Added - diff]
com/android/tools/build/manifest-merger/26.6.0-dev/manifest-merger-26.6.0-dev-sources.jar.sha1[Added - diff]
com/android/tools/build/manifest-merger/26.6.0-dev/manifest-merger-26.6.0-dev.jar[Added - diff]
com/android/tools/build/manifest-merger/26.6.0-dev/manifest-merger-26.6.0-dev.jar.md5[Added - diff]
com/android/tools/build/manifest-merger/26.6.0-dev/manifest-merger-26.6.0-dev.jar.sha1[Added - diff]
com/android/tools/build/manifest-merger/26.6.0-dev/manifest-merger-26.6.0-dev.pom[Renamed from com/android/tools/build/manifest-merger/26.4.0-beta05/manifest-merger-26.4.0-beta05.pom - diff]
com/android/tools/build/manifest-merger/26.6.0-dev/manifest-merger-26.6.0-dev.pom.md5[Added - diff]
com/android/tools/build/manifest-merger/26.6.0-dev/manifest-merger-26.6.0-dev.pom.sha1[Added - diff]
com/android/tools/build/manifest-merger/maven-metadata.xml[diff]
com/android/tools/common/26.4.0-beta05/common-26.4.0-beta05.jar[Deleted - diff]
com/android/tools/common/26.4.0-beta05/common-26.4.0-beta05.jar.md5[Deleted - diff]
com/android/tools/common/26.4.0-beta05/common-26.4.0-beta05.jar.sha1[Deleted - diff]
com/android/tools/common/26.4.0-beta05/common-26.4.0-beta05.pom.md5[Deleted - diff]
com/android/tools/common/26.4.0-beta05/common-26.4.0-beta05.pom.sha1[Deleted - diff]
com/android/tools/common/26.6.0-dev/common-26.6.0-dev.jar[Added - diff]
com/android/tools/common/26.6.0-dev/common-26.6.0-dev.jar.md5[Added - diff]
com/android/tools/common/26.6.0-dev/common-26.6.0-dev.jar.sha1[Added - diff]
com/android/tools/common/26.6.0-dev/common-26.6.0-dev.pom[Renamed from com/android/tools/common/26.4.0-beta05/common-26.4.0-beta05.pom - diff]
com/android/tools/common/26.6.0-dev/common-26.6.0-dev.pom.md5[Added - diff]
com/android/tools/common/26.6.0-dev/common-26.6.0-dev.pom.sha1[Added - diff]
com/android/tools/common/maven-metadata.xml[diff]
com/android/tools/ddms/ddmlib/26.4.0-beta05/ddmlib-26.4.0-beta05.jar[Deleted - diff]
com/android/tools/ddms/ddmlib/26.4.0-beta05/ddmlib-26.4.0-beta05.jar.md5[Deleted - diff]
com/android/tools/ddms/ddmlib/26.4.0-beta05/ddmlib-26.4.0-beta05.jar.sha1[Deleted - diff]
com/android/tools/ddms/ddmlib/26.4.0-beta05/ddmlib-26.4.0-beta05.pom.md5[Deleted - diff]
com/android/tools/ddms/ddmlib/26.4.0-beta05/ddmlib-26.4.0-beta05.pom.sha1[Deleted - diff]
com/android/tools/ddms/ddmlib/26.6.0-dev/ddmlib-26.6.0-dev.jar[Added - diff]
com/android/tools/ddms/ddmlib/26.6.0-dev/ddmlib-26.6.0-dev.jar.md5[Added - diff]
com/android/tools/ddms/ddmlib/26.6.0-dev/ddmlib-26.6.0-dev.jar.sha1[Added - diff]
com/android/tools/ddms/ddmlib/26.6.0-dev/ddmlib-26.6.0-dev.pom[Renamed from com/android/tools/ddms/ddmlib/26.4.0-beta05/ddmlib-26.4.0-beta05.pom - diff]
com/android/tools/ddms/ddmlib/26.6.0-dev/ddmlib-26.6.0-dev.pom.md5[Added - diff]
com/android/tools/ddms/ddmlib/26.6.0-dev/ddmlib-26.6.0-dev.pom.sha1[Added - diff]
com/android/tools/ddms/ddmlib/maven-metadata.xml[diff]
com/android/tools/dvlib/26.4.0-beta05/dvlib-26.4.0-beta05.jar[Deleted - diff]
com/android/tools/dvlib/26.4.0-beta05/dvlib-26.4.0-beta05.jar.md5[Deleted - diff]
com/android/tools/dvlib/26.4.0-beta05/dvlib-26.4.0-beta05.jar.sha1[Deleted - diff]
com/android/tools/dvlib/26.4.0-beta05/dvlib-26.4.0-beta05.pom.md5[Deleted - diff]
com/android/tools/dvlib/26.4.0-beta05/dvlib-26.4.0-beta05.pom.sha1[Deleted - diff]
com/android/tools/dvlib/26.6.0-dev/dvlib-26.6.0-dev.jar[Added - diff]
com/android/tools/dvlib/26.6.0-dev/dvlib-26.6.0-dev.jar.md5[Added - diff]
com/android/tools/dvlib/26.6.0-dev/dvlib-26.6.0-dev.jar.sha1[Added - diff]
com/android/tools/dvlib/26.6.0-dev/dvlib-26.6.0-dev.pom[Renamed from com/android/tools/dvlib/26.4.0-beta05/dvlib-26.4.0-beta05.pom - diff]
com/android/tools/dvlib/26.6.0-dev/dvlib-26.6.0-dev.pom.md5[Added - diff]
com/android/tools/dvlib/26.6.0-dev/dvlib-26.6.0-dev.pom.sha1[Added - diff]
com/android/tools/dvlib/maven-metadata.xml[diff]
com/android/tools/layoutlib/layoutlib-api/26.4.0-beta05/layoutlib-api-26.4.0-beta05.jar[Deleted - diff]
com/android/tools/layoutlib/layoutlib-api/26.4.0-beta05/layoutlib-api-26.4.0-beta05.jar.md5[Deleted - diff]
com/android/tools/layoutlib/layoutlib-api/26.4.0-beta05/layoutlib-api-26.4.0-beta05.jar.sha1[Deleted - diff]
com/android/tools/layoutlib/layoutlib-api/26.4.0-beta05/layoutlib-api-26.4.0-beta05.pom.md5[Deleted - diff]
com/android/tools/layoutlib/layoutlib-api/26.4.0-beta05/layoutlib-api-26.4.0-beta05.pom.sha1[Deleted - diff]
com/android/tools/layoutlib/layoutlib-api/26.6.0-dev/layoutlib-api-26.6.0-dev.jar[Added - diff]
com/android/tools/layoutlib/layoutlib-api/26.6.0-dev/layoutlib-api-26.6.0-dev.jar.md5[Added - diff]
com/android/tools/layoutlib/layoutlib-api/26.6.0-dev/layoutlib-api-26.6.0-dev.jar.sha1[Added - diff]
com/android/tools/layoutlib/layoutlib-api/26.6.0-dev/layoutlib-api-26.6.0-dev.pom[Renamed from com/android/tools/layoutlib/layoutlib-api/26.4.0-beta05/layoutlib-api-26.4.0-beta05.pom - diff]
com/android/tools/layoutlib/layoutlib-api/26.6.0-dev/layoutlib-api-26.6.0-dev.pom.md5[Added - diff]
com/android/tools/layoutlib/layoutlib-api/26.6.0-dev/layoutlib-api-26.6.0-dev.pom.sha1[Added - diff]
com/android/tools/layoutlib/layoutlib-api/maven-metadata.xml[diff]
com/android/tools/repository/26.4.0-beta05/repository-26.4.0-beta05.jar[Deleted - diff]
com/android/tools/repository/26.4.0-beta05/repository-26.4.0-beta05.jar.md5[Deleted - diff]
com/android/tools/repository/26.4.0-beta05/repository-26.4.0-beta05.jar.sha1[Deleted - diff]
com/android/tools/repository/26.4.0-beta05/repository-26.4.0-beta05.pom.md5[Deleted - diff]
com/android/tools/repository/26.4.0-beta05/repository-26.4.0-beta05.pom.sha1[Deleted - diff]
com/android/tools/repository/26.6.0-dev/repository-26.6.0-dev.jar[Added - diff]
com/android/tools/repository/26.6.0-dev/repository-26.6.0-dev.jar.md5[Added - diff]
com/android/tools/repository/26.6.0-dev/repository-26.6.0-dev.jar.sha1[Added - diff]
com/android/tools/repository/26.6.0-dev/repository-26.6.0-dev.pom[Renamed from com/android/tools/repository/26.4.0-beta05/repository-26.4.0-beta05.pom - diff]
com/android/tools/repository/26.6.0-dev/repository-26.6.0-dev.pom.md5[Added - diff]
com/android/tools/repository/26.6.0-dev/repository-26.6.0-dev.pom.sha1[Added - diff]
com/android/tools/repository/maven-metadata.xml[diff]
com/android/tools/sdk-common/26.4.0-beta05/sdk-common-26.4.0-beta05.jar[Deleted - diff]
com/android/tools/sdk-common/26.4.0-beta05/sdk-common-26.4.0-beta05.jar.md5[Deleted - diff]
com/android/tools/sdk-common/26.4.0-beta05/sdk-common-26.4.0-beta05.jar.sha1[Deleted - diff]
com/android/tools/sdk-common/26.4.0-beta05/sdk-common-26.4.0-beta05.pom.md5[Deleted - diff]
com/android/tools/sdk-common/26.4.0-beta05/sdk-common-26.4.0-beta05.pom.sha1[Deleted - diff]
com/android/tools/sdk-common/26.6.0-dev/sdk-common-26.6.0-dev.jar[Added - diff]
com/android/tools/sdk-common/26.6.0-dev/sdk-common-26.6.0-dev.jar.md5[Added - diff]
com/android/tools/sdk-common/26.6.0-dev/sdk-common-26.6.0-dev.jar.sha1[Added - diff]
com/android/tools/sdk-common/26.6.0-dev/sdk-common-26.6.0-dev.pom[Renamed from com/android/tools/sdk-common/26.4.0-beta05/sdk-common-26.4.0-beta05.pom - diff]
com/android/tools/sdk-common/26.6.0-dev/sdk-common-26.6.0-dev.pom.md5[Added - diff]
com/android/tools/sdk-common/26.6.0-dev/sdk-common-26.6.0-dev.pom.sha1[Added - diff]
com/android/tools/sdk-common/maven-metadata.xml[diff]
com/android/tools/sdklib/26.4.0-beta05/sdklib-26.4.0-beta05.jar[Deleted - diff]
com/android/tools/sdklib/26.4.0-beta05/sdklib-26.4.0-beta05.jar.md5[Deleted - diff]
com/android/tools/sdklib/26.4.0-beta05/sdklib-26.4.0-beta05.jar.sha1[Deleted - diff]
com/android/tools/sdklib/26.4.0-beta05/sdklib-26.4.0-beta05.pom.md5[Deleted - diff]
com/android/tools/sdklib/26.4.0-beta05/sdklib-26.4.0-beta05.pom.sha1[Deleted - diff]
com/android/tools/sdklib/26.6.0-dev/sdklib-26.6.0-dev.jar[Added - diff]
com/android/tools/sdklib/26.6.0-dev/sdklib-26.6.0-dev.jar.md5[Added - diff]
com/android/tools/sdklib/26.6.0-dev/sdklib-26.6.0-dev.jar.sha1[Added - diff]
com/android/tools/sdklib/26.6.0-dev/sdklib-26.6.0-dev.pom[Renamed from com/android/tools/sdklib/26.4.0-beta05/sdklib-26.4.0-beta05.pom - diff]
com/android/tools/sdklib/26.6.0-dev/sdklib-26.6.0-dev.pom.md5[Added - diff]
com/android/tools/sdklib/26.6.0-dev/sdklib-26.6.0-dev.pom.sha1[Added - diff]
com/android/tools/sdklib/maven-metadata.xml[diff]

139 files changed

tree: e67f720984bacb763fa054c650e0163bf695e3e3