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

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