tree 273b4b3aa02796bc8bdd73e40e26d81c25fa5e25
parent 78e865efc71199ed413ced4b34142e0dc0307b7d
parent b6f40305a524512fcc1dac175ba57f7c41655fd8
author Mark Brophy <mbrophy@google.com> 1422669669 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422669669 +0000

am b6f40305: am 24f64263: am 5337aea1: Merge "Revert "Updating the widget tray"" into ub-now-porkchop

* commit 'b6f40305a524512fcc1dac175ba57f7c41655fd8':