tree 3f4d6a5d99fd9e23f1960dfed2c18d77c53275a6
parent f6f0581de161b429d9dc01c7c28c5d44b9e7af6b
parent caf0317e4cd0cd19a1bed5e2c68ca2bc86b0f7ba
author Paul Duffin <paulduffin@google.com> 1536874225 -0700
committer android-build-merger <android-build-merger@google.com> 1536874225 -0700

Security Vulnerability - CVE-2012-6702 and CVE-2016-5300
am: caf0317e4c

Change-Id: Ib27dbd2764bf898a221f3b0ce09fd6b72bd91375