am a6965bee: am a4bd0ba6: am 7d0513e0: Merge "Don\'t show PII in logs for JSON-encoded uris" into klp-dev

* commit 'a6965beee5578785286ec3c522b0f1dc3a3600aa':
  Don't show PII in logs for JSON-encoded uris
tree: 9ef1a4f081221c10a4820d4deb9a5bb4bfb8710f
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags