| commit | 230e365e694749ed205e4093706cd79eca51ce44 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Oct 08 08:29:27 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 08:29:27 2021 +0000 |
| tree | f3da1a8f09de6dbe491b31ea3693307aeffe4b32 | |
| parent | f32e1267e680e5a24ac9eec90e59e5d637e2bcea [diff] | |
| parent | 2bb0d1d74a2ebae7685308304464f0c2e7b88350 [diff] |
[automerger skipped] Merge "Merge Android 12" am: a71a3cefab -s ours am: 3db7f818bd -s ours am: 37f8ca3ee8 -s ours am: 2bb0d1d74a -s ours am skip reason: Merged-In I972cce490ce5f64ed513b7c8b6b7ed1a884af731 with SHA-1 a696dcad2d is already in history Original change: https://android-review.googlesource.com/c/platform/tools/base/+/1847925 Change-Id: I99c9509c40c6bd63363bb91aa02ff0be17d0830c