aml_con_331011010
Snap for 8564071 from 500d41bcb3c7424c255b94249138817d04076ea2 to mainline-conscrypt-release

Change-Id: I60ffdbbf2c5d1fa68b9d29dd0b4163c3c1a417b5
tree: 2357a0901a10a4258ebb9e1bd017995e1d61eabb
  1. art/
  2. res/
  3. src/
  4. Android.bp
  5. AndroidManifest.xml