commit | 154fbde93a14c536222fa98bfd96ceefac66cbad | [log] [tgz] |
---|---|---|
author | Xin Li <[email protected]> | Fri Oct 08 07:56:28 2021 +0000 |
committer | Automerger Merge Worker <[email protected]> | Fri Oct 08 07:56:28 2021 +0000 |
tree | 76e65a9b745037464542fb1336565284b71d8535 | |
parent | 083097e7fc5232e2f631a18a52fe132d8d063b53 [diff] | |
parent | 44620257a047e7f25a568ec739c471543d211072 [diff] |
[automerger skipped] Merge "Merge Android 12" am: 1a18922293 -s ours am: e6ba0053fe -s ours am: 44620257a0 -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: Ied4e1fc384d8874e404857a96b831f9e1fd77b70