| commit | daf6cdff947a739c9a2f07442fae1580966354db | [log] [tgz] |
|---|---|---|
| author | Siqi Lin <siqilin@google.com> | Wed Jul 19 15:37:27 2017 -0700 |
| committer | Siqi Lin <siqilin@google.com> | Wed Jul 19 15:38:12 2017 -0700 |
| tree | c9bf144283a471e6276b94886a6d39f638d43dc1 | |
| parent | 0facf2bf5a6094e4e6d47852b5f907d3d4b928bd [diff] | |
| parent | 637d1d5d10ff1179cc18b24230e1b9c8af63183d [diff] |
Merge branch 'android-msm-shamu-3.10-security-next' into android-msm-shamu-3.10 September 2017.1 Bug: 63173776 Change-Id: Ifd320267b9f7547a73391334cb5b26372f0bb772