tree 089e54d756f1672e29a7e92fca51133e7b8caa5d
parent c7b71198b9a39119839094b57f484ed08193e63d
parent 7fa28cdf92a1c4c60686b832ec01e88c94971c61
author Bjorn Bringert <bringert@google.com> 1380842777 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380842777 -0700

am 7fa28cdf: am ed60ba1e: Merge "Add a better app filtering mechanism and filter widgets" into jb-ub-now-indigo-rose

* commit '7fa28cdf92a1c4c60686b832ec01e88c94971c61':
  Add a better app filtering mechanism and filter widgets