tree c028bfe537607823c37e2ffc8c713c73059d3130
parent 01983b5e3e3086b146fac3a4c63e9a2fe4e93332
parent 13f733710cc84ce0a627f4de6cb9ca79562df81d
author Mark Brophy <mbrophy@google.com> 1422685282 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422685282 +0000

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

* commit '13f733710cc84ce0a627f4de6cb9ca79562df81d':