| commit | e995ad1559ac12a0ac5e2e56ce378b0b29f10f24 | [log] [tgz] |
|---|---|---|
| author | Christopher Tate <ctate@google.com> | Wed Nov 13 12:07:22 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 13 12:07:22 2013 -0800 |
| tree | 929fef2868f3421870f00a2a6fca4ea360af1452 | |
| parent | 2f4fb5eef5ac5c08f7d30c75b56990ce5a729509 [diff] | |
| parent | 0b2c2b10053afd7a525dbf8a4eb0f0aaf98739b3 [diff] |
am 0b2c2b10: Merge "Support preferred activities with zero or one scheme in the filter" into klp-dev * commit '0b2c2b10053afd7a525dbf8a4eb0f0aaf98739b3': Support preferred activities with zero or one scheme in the filter