commit | 8366779010dd007cf302dca14695ca34e4c62661 | [log] [tgz] |
---|---|---|
author | Cyan_Hsieh <cyanhsieh@google.com> | Mon Feb 03 14:55:13 2020 +0800 |
committer | Cyan_Hsieh <cyanhsieh@google.com> | Tue Feb 04 21:42:31 2020 +0800 |
tree | f8d0eab3eb16dffac3060f48f0ea7f0e82b247eb | |
parent | b893cc4ab7f3f471b391e6081085f094db3a9bee [diff] | |
parent | 3f77edd72dfdaa2b0595596fb9db6c5a95931abe [diff] |
Merge remote-tracking branch 'goog/qcom/release/LA.UM.8.1.C9.09.00.00.518.406' into qt-qpr1-dev Conflicts: sdm/libs/hwc2/Android.mk sdm/libs/hwc2/hwc_session.cpp Bug: 148752159 Change-Id: Ic0cd0d299afc5a897d6ea2074f1e882565d53e93