tag | 878f9a042579227e19c293e21b251a18b097a8d7 | |
---|---|---|
tagger | The Android Open Source Project <initial-contribution@android.com> | Mon Nov 02 14:23:57 2020 -0800 |
object | d88d11796e03f56df05d25333e11767b094b2cae |
Android 11.0.0 release 0.25
commit | d88d11796e03f56df05d25333e11767b094b2cae | [log] [tgz] |
---|---|---|
author | Wilson Sung <wilsonsung@google.com> | Thu May 07 09:41:46 2020 +0800 |
committer | Wilson Sung <wilsonsung@google.com> | Thu May 28 12:57:34 2020 +0800 |
tree | 2c9fa6e2a00ef18c6d67e0e9c14cb467375422c0 | |
parent | ab8c09947fbd1e997a878e49dc1b41ab9fee5cb4 [diff] | |
parent | a1b08d18897c8601e3d0d77d57b25f59b9c343eb [diff] |
Merge branch 'LA.UM.9.1.R1.10.00.00.604.038' via branch 'qcom-msm-4.14' into android-msm-pixel-4.14 Conflicts: drivers/emac-dwc-eqos/DWC_ETH_QOS_yheader.h drivers/rmnet/shs/rmnet_shs_wq.c Bug: 155859424 Signed-off-by: Wilson Sung <wilsonsung@google.com> Change-Id: Ia233ce675f3ffea5de23e0e146199f9da937abd4