tree 80f2e08a1bed79982af02a1fd13a3dd176cccc22
parent 086034117d9214de6339a29b93412276eb00afea
parent e995ad1559ac12a0ac5e2e56ce378b0b29f10f24
author Christopher Tate <ctate@google.com> 1384373669 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384373669 -0800

am e995ad15: am 0b2c2b10: Merge "Support preferred activities with zero or one scheme in the filter" into klp-dev

* commit 'e995ad1559ac12a0ac5e2e56ce378b0b29f10f24':
  Support preferred activities with zero or one scheme in the filter