aml_con_331011010
Snap for 8982257 from c1305d6cf6ec3b5835349eae8b2ab495fd8ec2c9 to mainline-conscrypt-release

Change-Id: Idbe9f61fe30f15e01cdb5118cf20ebd306603f23
tree: e0969b537a5855738e399f682f45df5438a0fc70
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. CleanSpec.mk
  6. OWNERS