tree e25dff5fd21097fa62b1a8a3e2525d349cc08d20
parent 5f156f1412d3b5108bcdb869acb0d6a4376d0f57
parent 4e08f14a64f0d22a282546010bc38756087e79e8
author Bjorn Bringert <bringert@google.com> 1392410156 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410156 +0000

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

* commit '4e08f14a64f0d22a282546010bc38756087e79e8':