Fixing bug in security vulnerability patch am: fd8d014e0d
am: 2b85018b12  -s ours

Change-Id: I2ed185a4da5fe1d76f9f1447b0d5a10e8b1bf051
tree: 4310240af038a8568f9e9b5d601fbd0020b5ca5c
  1. keystore/
  2. keystore-engine/
  3. Android.bp
  4. MODULE_LICENSE_APACHE2
  5. NOTICE
  6. OWNERS