commit | f130fff6e39c9fc3b9fa0af4d26ec022cf96fa99 | [log] [tgz] |
---|---|---|
author | Xin Li <[email protected]> | Fri Oct 08 08:59:37 2021 +0000 |
committer | Automerger Merge Worker <[email protected]> | Fri Oct 08 08:59:37 2021 +0000 |
tree | 8f64f42f371f741669c7b8e197e26c4c3ecf09a9 | |
parent | ee36b8f16325e9ff9c0a7f847d1cf4dc2636397a [diff] | |
parent | f2b5d057d7e1a1907f3bbdbc77b01fc821f4d046 [diff] |
[automerger skipped] Merge "Merge Android 12" am: 1a18922293 -s ours am: e6ba0053fe -s ours am: 44620257a0 -s ours am: 154fbde93a -s ours am: f2b5d057d7 -s ours am skip reason: Merged-In Ib7852498d75746d07ea035ba1dc9302eb0d9d7ac with SHA-1 15787136e8 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/rs/+/1847457 Change-Id: If5351cb520568f8059f2b8817edecd3c3d0724d1