tree f700e4f063c19500283067edb1b11e8b1fc9a105
parent c40ed4d76a7ce8b36e14ef00b25e2189f90c35f5
parent 45f25f7ba5aca87e8709b4901ca7057dbb4a3ccf
author Andre Eisenbach <eisenbach@google.com> 1421365315 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1421365315 +0000

am 45f25f7b: Merge "Improve VCARD filter logic and reduce log spam" into lmp-mr1-dev

* commit '45f25f7ba5aca87e8709b4901ca7057dbb4a3ccf':
  Improve VCARD filter logic and reduce log spam