tree bde7d2463e2265a429c3f3dac1be979226b34955
parent 5eaafe230675ae5ac12ac060d2a040b45abe685a
parent 9293ea4c8650a2907772f684a7c9415f82414539
author William Luh <williamluh@google.com> 1380686302 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380686302 -0700

am 9293ea4c: am e3e22062: Merge "Add new cert_pin_failure tag that can be used in user-consent filtering." into klp-dev

* commit '9293ea4c8650a2907772f684a7c9415f82414539':
  Add new cert_pin_failure tag that can be used in user-consent filtering.