tree 5955521c6f623975fb69913441fb10767bb22699
parent ab39aff019e80a931c22df549a94fbb0dcf784ac
parent 99710c6cef8a0537c85afcd2618d95c7755865e6
author James Lemieux <jplemieux@google.com> 1414955562 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414955562 +0000

am 99710c6c: am ccf9a34b: Add support for disabling email sanitization

* commit '99710c6cef8a0537c85afcd2618d95c7755865e6':
  Add support for disabling email sanitization