| commit | e53791a6fc7af7ba90376ae1dba389b1476269b6 | [log] [tgz] |
|---|---|---|
| author | Wilson Sung <wilsonsung@google.com> | Thu May 20 19:19:13 2021 +0800 |
| committer | ChihYao Chien <ccchien@google.com> | Mon May 24 15:53:51 2021 +0800 |
| tree | 4995670f03ebbfcb5c66970390ca4e3de0f3b7a4 | |
| parent | 9bc4795125a764b4bc60c5eae13b6820ded2e637 [diff] | |
| parent | 9a4f595765b9afa05d85ac329b3e607053613d15 [diff] |
Merge remote-tracking branch 'goog/qcom/release/LA.UM.9.12.C10.11.00.00.840.010' into sc-dev Conflicts: composer/hwc_display_builtin.h config/display-product.mk libqservice/IQService.h Bug: 187909050 Change-Id: If2d29425e021a39cfa49d39bdd259177ca519165