summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2021-10-08 08:29:36 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-10-08 08:29:36 +0000
commit1fa01d73161467b8f2a0753bca3ec5bfef7bcab1 (patch)
tree8c986e32937c71d62844fdcc8157acc6c3377538
parentcc3e03f54cf45167187700f02784fc6ea3dae07d (diff)
parent9b8b20c8801c39c2ce063c16484c1d4eb8edcffd (diff)
downloadadt-infra-master.tar.gz
[automerger skipped] Merge Android 12 am: f8e47a07be -s ours am: b12ffeee7f -s ours am: 156a09762e -s ours am: 9b8b20c880 -s oursHEADmastermain
am skip reason: Merged-In I965e46e02e7c0f58a7d93244526a8b54f63a1913 with SHA-1 d50b4c7322 is already in history Original change: https://android-review.googlesource.com/c/platform/external/adt-infra/+/1847420 Change-Id: Ie7bc262fbbb9045d90bfe34e4c2093ecefb3571f
0 files changed, 0 insertions, 0 deletions