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

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