tree 672e8cfbbb1a34775c86f702d5d9ff99dd3d2435
parent af7ec75b23529514f08041662b6875bfde471da3
parent 20e00b3f96d564277a244625b6d15d8671c64be5
author Jeff Tinker <jtinker@google.com> 1526067751 -0700
committer android-build-merger <android-build-merger@google.com> 1526067751 -0700

Merge "Fix security vulnerability in CryptoHal" into oc-dev
am: 20e00b3f96

Change-Id: I55c59bfe9a1d1e2444e4c5d7b244a0a99dae2b04