tree 063f7d6335838c78eacf4da93b22d8a7d5f19d89
parent f424287b8e4eb1fa310793ef454e7ebc75fbf687
parent 96c47570ccb527d8b850b8d72194ae22ab6144cb
author Feng Yu <feny@google.com> 1474938523 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1474938523 +0000

Merge "Security Vulnerability - CVE-2012-6702 and CVE-2016-5300" into security-aosp-mnc-mr1-release