diff options
author | Xin Li <delphij@google.com> | 2021-12-14 21:51:05 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-14 21:51:05 +0000 |
commit | 7bbb6d29e5571cf5e4cc8646fabed02972be0ef0 (patch) | |
tree | c7566fc6b36b42899f632ad5dfe0843da19031f8 | |
parent | cccc4b784a707e860ed2811b26536110072a2324 (diff) | |
parent | c6068536805f7373875796e1b7b27e8c92a363e3 (diff) | |
download | generic-7bbb6d29e5571cf5e4cc8646fabed02972be0ef0.tar.gz |
[automerger skipped] Merge Android 12 QPR1 am: 36af9f20f3 -s ours am: 0736a32284 -s ours am: c606853680 -s ours
am skip reason: Merged-In Id03b97cc6d3651627cbfda9d09ce4fe8be9f8ec9 with SHA-1 c1726eca5c is already in history
Original change: https://android-review.googlesource.com/c/platform/external/nos/host/generic/+/1921895
Change-Id: I9cca191a3af11d396f2e63084ceba2781264a463
0 files changed, 0 insertions, 0 deletions