tree 6510a6e902da44e1cecd6d4a9e47a7aaaba76ca8
parent e90546b406eff6c09c80ff417aa24880c4428ac0
parent 0b3cb900e4ccaa020f1a1eaa5ff65e8c2e79e03a
author Jeff Sharkey <jsharkey@android.com> 1381183936 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381183936 -0700

am 5e02e0a9: am bcc77b50: Merge "Add <intent-filter> support to <provider>." into klp-dev

* commit '5e02e0a9e1e075e3d451d929b0a67bf280c432ed':
  Add <intent-filter> support to <provider>.