commit | 44620257a047e7f25a568ec739c471543d211072 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Oct 08 01:39:13 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 01:39:13 2021 +0000 |
tree | 76e65a9b745037464542fb1336565284b71d8535 | |
parent | d80169d26d6739cd83ef16442ed16690f178bf1a [diff] | |
parent | e6ba0053fef97614c2fe2783dbc5fab8e005c185 [diff] |
[automerger skipped] Merge "Merge Android 12" am: 1a18922293 -s ours am: e6ba0053fe -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: Ifc81c5a45e4335b0b8374303845ed74c61cef8cc