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

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