Age | Commit message (Collapse) | Author |
|
Change-Id: I1f875da45f4b3b5ca3f4608fde4bb14f710662d5
|
|
-s ours am: 11be6eb68c -s ours am: bfeae14ba3 -s ours am: 11409c7cdc -s ours
am skip reason: Merged-In I8f169fca607c40fb9961ff5bf288953bb4a4b768 with SHA-1 b641788cc6 is already in history
Original change: https://android-review.googlesource.com/c/platform/prebuilts/manifest-merger/+/1847447
Change-Id: I9e607ee5657b1a21384f8e1298f6fe058bb787e0
|
|
-s ours am: 11be6eb68c -s ours am: bfeae14ba3 -s ours
am skip reason: Merged-In I8f169fca607c40fb9961ff5bf288953bb4a4b768 with SHA-1 b641788cc6 is already in history
Original change: https://android-review.googlesource.com/c/platform/prebuilts/manifest-merger/+/1847447
Change-Id: Idbbf504e35e20bc431d0b65f491d812263f00240
|
|
-s ours am: 11be6eb68c -s ours
am skip reason: Merged-In I8f169fca607c40fb9961ff5bf288953bb4a4b768 with SHA-1 b641788cc6 is already in history
Original change: https://android-review.googlesource.com/c/platform/prebuilts/manifest-merger/+/1847447
Change-Id: I427200e8bfb2162f544977dc6aa78b40cee7ea7b
|
|
-s ours
am skip reason: Merged-In I8f169fca607c40fb9961ff5bf288953bb4a4b768 with SHA-1 b641788cc6 is already in history
Original change: https://android-review.googlesource.com/c/platform/prebuilts/manifest-merger/+/1847447
Change-Id: I501b5666c3c8270546f7e4afeeee9e652c5c05ca
|
|
am skip reason: Merged-In I8f169fca607c40fb9961ff5bf288953bb4a4b768 with SHA-1 b641788cc6 is already in history
Original change: https://android-review.googlesource.com/c/platform/prebuilts/manifest-merger/+/1847447
Change-Id: Iea951bee8b353401f25f7938a42089710812acf1
|
|
Bug: 202323961
Merged-In: I8f169fca607c40fb9961ff5bf288953bb4a4b768
Change-Id: Ic4d1256e3f5c3aa97d9156f3c5166068bc14e78b
|
|
Change-Id: Ib4ec80e2fa010207d2920965060d9d495599ecbf
|
|
ours am: 467e64a8c4 -s ours am: b96be039ba -s ours am: af3721a1f6 -s ours
am skip reason: Merged-In I8f169fca607c40fb9961ff5bf288953bb4a4b768 with SHA-1 99626c9a6c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/manifest-merger/+/15828100
Change-Id: Ibe65c7698ebaa7dac32f985d7a1538be40396cdc
|
|
ours am: 467e64a8c4 -s ours am: b96be039ba -s ours
am skip reason: Merged-In I8f169fca607c40fb9961ff5bf288953bb4a4b768 with SHA-1 99626c9a6c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/manifest-merger/+/15828100
Change-Id: I1c8b05ee9c72c52252664389a44800639d2bf5a1
|
|
ours am: 467e64a8c4 -s ours
am skip reason: Merged-In I8f169fca607c40fb9961ff5bf288953bb4a4b768 with SHA-1 99626c9a6c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/manifest-merger/+/15828100
Change-Id: I83c8f7e7f58ba9c96a2372f188fe826a4bf50dfb
|
|
am skip reason: Merged-In I8f169fca607c40fb9961ff5bf288953bb4a4b768 with SHA-1 99626c9a6c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/manifest-merger/+/15828100
Change-Id: Id3e9923cafbf3aae8271e8a525ba584e2623c25e
|
|
Bug: 195988762
Test: make
Change-Id: I8f169fca607c40fb9961ff5bf288953bb4a4b768
Merged-In: I8f169fca607c40fb9961ff5bf288953bb4a4b768
(cherry picked from commit 78bd55ce18fe74f4aaa90e5ab81631ce2acdcbbf)
|
|
Change-Id: I62c8bf3f6cba69906724c050e64f08b7bf2b1f18
|
|
799d25803f am: 12a2efaabd -s ours
am skip reason: Merged-In I8f169fca607c40fb9961ff5bf288953bb4a4b768 with SHA-1 78bd55ce18 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/manifest-merger/+/15600270
Change-Id: I538918dc6d7b4101c1e62afe69604b940266073c
|
|
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/manifest-merger/+/15600270
Change-Id: I61d93c092aafbdd6653fe28625cc1b7c69144c85
|
|
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/manifest-merger/+/15600270
Change-Id: I6a303b3c68bd91c3fae1d8cd3b7c4e1b4861a553
|
|
Bug: 195988762
Test: make
Change-Id: I8f169fca607c40fb9961ff5bf288953bb4a4b768
Merged-In: I8f169fca607c40fb9961ff5bf288953bb4a4b768
(cherry picked from commit 78bd55ce18fe74f4aaa90e5ab81631ce2acdcbbf)
|
|
Change-Id: I0b38784b99e39084c17efc5d33416fc67101d716
|
|
Bug: 195988762
Test: make
Change-Id: I8f169fca607c40fb9961ff5bf288953bb4a4b768
|
|
Change-Id: I20d82f080115b106e1b93e264671c53e497378d8
|
|
Bug: 189946434
Change-Id: I554fc4ac3e76e4acbf249eeb28cd443467435865
|
|
Change-Id: Ic18f043758a2b87c8a919160f36471343dcd6334
|
|
am: 3c52d591be am: ea3a575cd1 am: 111c2bf71d
Original change: https://android-review.googlesource.com/c/platform/prebuilts/manifest-merger/+/1588373
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie48bcf2f7f34977d7c0448e17939bc7be2a9881c
|
|
am: 3c52d591be am: ea3a575cd1 am: 111c2bf71d
Original change: https://android-review.googlesource.com/c/platform/prebuilts/manifest-merger/+/1588373
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Idd7eb85082d1f2f663fa8859b1dffe7520735315
|
|
am: 3c52d591be am: ea3a575cd1
Original change: https://android-review.googlesource.com/c/platform/prebuilts/manifest-merger/+/1588373
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6d8b37132af4e1d97aa2e990ce94f4c21455e9b8
|
|
am: 3c52d591be
Original change: https://android-review.googlesource.com/c/platform/prebuilts/manifest-merger/+/1588373
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I340dcc42b377d2bc6c5acec813163784aa0d8002
|
|
Original change: https://android-review.googlesource.com/c/platform/prebuilts/manifest-merger/+/1588373
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia87a0b84e03cf05bf6c7933c1c5d971b588358aa
|
|
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
|
|
-s ours am: ba680f7a20 -s ours am: 41a9aef732 -s ours am: 8c968172f3 -s ours
am skip reason: Change-Id I1ae4134b93e99fc56cc0935e0e78df197e0d9487 with SHA-1 a7fa0bf870 is in history
Original change: https://android-review.googlesource.com/c/platform/prebuilts/manifest-merger/+/1422514
Change-Id: I6a382def35aa1eb5230f7aad2d9ebd643ff75639
|
|
-s ours am: ba680f7a20 -s ours am: 41a9aef732 -s ours
am skip reason: Change-Id I1ae4134b93e99fc56cc0935e0e78df197e0d9487 with SHA-1 a7fa0bf870 is in history
Original change: https://android-review.googlesource.com/c/platform/prebuilts/manifest-merger/+/1422514
Change-Id: I8f9a0c084b393445dc9dc8f617fd410bf4b742fa
|
|
-s ours am: ba680f7a20 -s ours
am skip reason: Change-Id I1ae4134b93e99fc56cc0935e0e78df197e0d9487 with SHA-1 a7fa0bf870 is in history
Original change: https://android-review.googlesource.com/c/platform/prebuilts/manifest-merger/+/1422514
Change-Id: I4230b2f99e72e02b6f1664c86aab74224929e726
|
|
-s ours
am skip reason: Change-Id I1ae4134b93e99fc56cc0935e0e78df197e0d9487 with SHA-1 a7fa0bf870 is in history
Original change: https://android-review.googlesource.com/c/platform/prebuilts/manifest-merger/+/1422514
Change-Id: Ie2ff90ed17c1ef395ce8fc75a98cf4397d03ad4e
|
|
am skip reason: Change-Id I1ae4134b93e99fc56cc0935e0e78df197e0d9487 with SHA-1 a7fa0bf870 is in history
Original change: https://android-review.googlesource.com/c/platform/prebuilts/manifest-merger/+/1422514
Change-Id: I7201317de62879c4c92231eaa7defa48819784db
|
|
Bug: 168057903
Merged-In: I1ae4134b93e99fc56cc0935e0e78df197e0d9487
Change-Id: Id386426fcb199ada5a43cdff8fe47a3a40fbd47f
|
|
(rvc-dev-plus-aosp-without-vendor@6692709) am: a7fa0bf870 -s ours am: 8bac6b97c4 -s ours am: 2f5f6ede49 -s ours am: 4c93650f42 -s ours
am skip reason: Change-Id I1e54186afca0843a1607b33465c37aece62f4522 with SHA-1 3b9fc994c7 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/manifest-merger/+/12470342
Change-Id: Ic62658d00589485f1e678ab372676275e88d68e2
|
|
(rvc-dev-plus-aosp-without-vendor@6692709) am: a7fa0bf870 -s ours am: 8bac6b97c4 -s ours am: 2f5f6ede49 -s ours
am skip reason: Change-Id I1e54186afca0843a1607b33465c37aece62f4522 with SHA-1 3b9fc994c7 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/manifest-merger/+/12470342
Change-Id: Id9046c05038cfaf901c413aec50e9ba1c6781ba4
|
|
(rvc-dev-plus-aosp-without-vendor@6692709) am: a7fa0bf870 -s ours am: 8bac6b97c4 -s ours
am skip reason: Change-Id I1e54186afca0843a1607b33465c37aece62f4522 with SHA-1 3b9fc994c7 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/manifest-merger/+/12470342
Change-Id: Id5a9c1dcd94696fe1871407bab597ffa2401cebb
|
|
(rvc-dev-plus-aosp-without-vendor@6692709) am: a7fa0bf870 -s ours
am skip reason: Change-Id I1e54186afca0843a1607b33465c37aece62f4522 with SHA-1 3b9fc994c7 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/manifest-merger/+/12470342
Change-Id: I4f4c42ef15e5f5807b0974141a545cf40ace2132
|
|
Bug: 166295507
Merged-In: I1e54186afca0843a1607b33465c37aece62f4522
Change-Id: I1ae4134b93e99fc56cc0935e0e78df197e0d9487
|
|
Bug: 139128472
Test: m checkbuild
Change-Id: I1e54186afca0843a1607b33465c37aece62f4522
|
|
am: 11382bfe70
Change-Id: I86b13e45a4d627c5e80cc7d7679154ac5d6b69d6
|
|
am: 25de7bcfa6
Change-Id: I75e1c8440865685327db1bdd9991ac3748c9e2c8
|
|
am: 435f021d98
Change-Id: I2a23c59c30a7fe06935f9a4e8004015c012f9eb3
|
|
Add a manifest-merger java_binary_host module to build a self
contained binary for running manifest-merger.
Bug: 112607039
Test: m checkbuild
Change-Id: I2f9e1778b61099710d6b22b88692fa5f965061a4
|
|
am: 0ea3bd9350
Change-Id: Ifd74c058e6d6d3a91ac7973810a5c4fcc95a982c
|
|
am: bba196045a
Change-Id: I59d648459c5ecbb3766f191c529437a6486e18e7
|
|
am: 822a1075c3
Change-Id: Icba5fdf7db4d43a6217e3b1a82f5b796a71684cf
|
|
Generated with:
rm -rf com/android
JAVA_HOME=$ANDROID_BUILD_TOP/prebuilts/jdk/jdk8/linux-x86/ \
./import-maven-artifacts.sh com.android.tools.build:manifest-merger:26.4.0-beta05
Bug: 112607039
Test: m checkbuild
Change-Id: Iefb0d57a75c7df5ef8746e77751a91f730fec832
|
|
am: 080bb5acdb
Change-Id: I01d5aefa6f8c9e5ef45bb670f4aa7f64b96b6901
|