tree 10da860fcff71886af91d082e31f0e1917926848
parent a53e49af19865a6697e978d44ee04cd18d339e16
parent bf40d9235c05d474f942144c68382d521050f371
author Bjorn Bringert <bringert@google.com> 1414566143 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566143 +0000

am bf40d923: 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 'bf40d9235c05d474f942144c68382d521050f371':