commit | 02be3a1bdda108fbb98239504c839755a9fff8b2 | [log] [tgz] |
---|---|---|
author | Thierry Strudel <tstrudel@google.com> | Tue Jun 21 16:14:16 2016 -0700 |
committer | Thierry Strudel <tstrudel@google.com> | Tue Jun 21 23:27:56 2016 +0000 |
tree | c60f580acf87903e975109911a31621e02819f1d | |
parent | 8451c8e5da81409d6aad453dfb313734a130e512 [diff] | |
parent | cbe2c07d79668a2b53a43270bb0e8bd52cad0910 [diff] |
Merge branch 'android-msm-shamu-3.10-security-next' into android-msm-shamu-3.10 Merge security-next into master @ 8451c8e for August 2016.2