commit | 5f6122281a4fb154803675062eea33d31734ea9d | [log] [tgz] |
---|---|---|
author | Huihong Luo <huisinro@google.com> | Thu Feb 20 15:40:38 2020 -0800 |
committer | Oscar Azucena <oscarazu@google.com> | Mon Sep 14 12:41:14 2020 -0700 |
tree | 7fc58f6c0eea532f09e02e8b4e0b8487d61987b3 | |
parent | 3b204181fae6f03b18d8b5d5059845326da76268 [diff] |
Revert "Revert "Upgrade HWC from 2.1 to 2.3"" This reverts commit b64da5cf7ac7b4dcacd4ebb7e1c772396e4b3d9b. Fixed some merge conflicts. Bug: 147264301 Test: blaze --blazerc=/dev/null test -- //javatests/com/google/android/apps/common/testing/flakemeister:FlakemeisterTest_google_30 Change-Id: Id60b61737833881d4f7bdd190cdb6f8ca0de9157 Merged-In: Id60b61737833881d4f7bdd190cdb6f8ca0de9157 (cherry picked from commit f8245228ff1bf45983f6415dc15f9bcfee715148)