commit | 4ab7e8a8069f4acbcf87212dbb7d3147e80968c3 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Tue Dec 14 21:51:06 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Dec 14 21:51:06 2021 +0000 |
tree | 428cf3250154e754aba76813cdc10dc7e6e10ab5 | |
parent | 3c0fdffe638cddbdbf7724c27a3261ab2306ef41 [diff] | |
parent | 2b72f9ff1b8b3859b20ab7c92f54134c430ad46b [diff] |
[automerger skipped] Merge "Merge Android 12 QPR1" am: 2766181404 -s ours am: 2ae1ac7392 -s ours am: 2b72f9ff1b -s ours am skip reason: Merged-In I931120e34f83ca3f667d94d1cf09659908b41463 with SHA-1 5d3e1c5fe6 is already in history Original change: https://android-review.googlesource.com/c/platform/external/sonivox/+/1921932 Change-Id: I1a636b13007cb98bb766185b140601ec1594a451