tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent 0b9b098460630e042f9da09df8b764feb1bfe419
parent 05a797faf9d177ebb1d9b346eccc70af1c1c7861
author Bjorn Bringert <bringert@google.com> 1392411044 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411044 +0000

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 '05a797faf9d177ebb1d9b346eccc70af1c1c7861':