tree cba62d0d64153aa2169651696bc238591341d679
parent b23bea7cf4496aad89938f15bd08ef169b608d40
parent 306b9805c2edbab17036253e77a35c828f69e5dd
author Bjorn Bringert <bringert@google.com> 1414085250 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085250 +0000

am 306b9805: am 05a797fa: am 4e08f14a: am 7fa28cdf: am ed60ba1e: Merge "Add a better app filtering mechanism and filter widgets" into jb-ub-now-indigo-rose

* commit '306b9805c2edbab17036253e77a35c828f69e5dd':