commit | db3951ac3c7160c008603c9fdd78913e6bd3f9e6 | [log] [tgz] |
---|---|---|
author | hoax <hoax@google.com> | Mon Apr 18 20:14:26 2022 +0000 |
committer | hoax <hoax@google.com> | Mon Apr 18 20:14:26 2022 +0000 |
tree | fe252e32bac1082eece97430f975a88dc2971c0e | |
parent | e3ccc3210ee5793c05b4a30b96a359c958b014d4 [diff] |
resolve merge conflicts of 01d30534ffe347c5069fc36096b257e800fb8d0b to android12L-tests-dev Original change: https://android-review.googlesource.com/c/platform/cts/+/2063874 Bug: 229633546 Change-Id: I5e97da2b892e9f5557c34357a044719f40c2655c