am 82df3a03: am c1c71e39: am 6c34480e: Merge "KeyChain does not use cleartext network traffic." into mnc-dev

* commit '82df3a03fd954fd9b1cca1fb7dc2a0ed415b791b':
  KeyChain does not use cleartext network traffic.
tree: 8eac659f7384ba565109f18bcc495c8ea310432e
  1. res/
  2. src/
  3. support/
  4. tests/
  5. Android.mk
  6. AndroidManifest.xml