tree e9757617c387a17e952b9b9b1ab3f008c61235ef
parent f1bab3c8162a0f9ee553c369d8e36157fa00ea07
parent 9d1383c61ca0932cb36b104a89c32db15de6a10e
author Jeff Sharkey <jsharkey@android.com> 1381184174 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381184174 -0700

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

* commit '9d1383c61ca0932cb36b104a89c32db15de6a10e':
  Add <intent-filter> support to <provider>.