am 833a6d9f: Merge "Fix log errors and hide PII statically." into lmp-preview-dev

* commit '833a6d9f594dd25dca59af2a3e83db927680f113':
  Fix log errors and hide PII statically.
tree: e5fe12f60527732bfff42a384d1a954886d3ab40
  1. libs/
  2. res/
  3. src/
  4. tests/
  5. .classpath
  6. .project
  7. Android.mk
  8. AndroidManifest.xml