| commit | ba237a1ff9162041f895a53e4bde7eff211f0be5 | [log] [tgz] |
|---|---|---|
| author | Robin Peng <robinpeng@google.com> | Tue May 12 17:10:14 2020 +0800 |
| committer | Roger Liao <rogerliao@google.com> | Wed May 13 17:18:21 2020 +0800 |
| tree | 82f5ddeda808c5de871686013726a0c2d667928b | |
| parent | b6da9f974100841b57b0d5b7059513f634758235 [diff] | |
| parent | 3fcd0073ffdaffde1be1ebca47bec7513d001e8c [diff] |
Merge remote-tracking branch 'goog/qcom/release/LA.UM.9.12.R2.10.00.00.685.004' into rvc-d1-dev Conflicts: conf_files/lito/lito.mk Bug: 156322859 Change-Id: I9b82f66d56de5efd9c0077eb6ea6310ff772a90b