commit | d0ec9925a61fa7546423ac21db94c229624588dc | [log] [tgz] |
---|---|---|
author | Harrison Lingren <hlingren@google.com> | Sat Aug 10 04:57:14 2019 +0000 |
committer | Harrison Lingren <hlingren@google.com> | Sat Aug 10 04:57:14 2019 +0000 |
tree | 8ba02182389075a38b1da55b84113343c2156695 | |
parent | 83bee1dc48e8e99337ae85ca2c5c92d48c25da59 [diff] | |
parent | ce1dadbf3ad9986caed9f50c22a96360b2ff5c52 [diff] |
Merge branch 'android-msm-wahoo-4.4-qt-security-next' into android-msm-wahoo-4.4-qt OCT 2019.1 Bug: 137800028 Bug: 139157052 Signed-off-by: Adam Shih <adamshih@google.com> Change-Id: Id6cfe6aa020ed49c3ff68140eee1267def7b1ccb