tree 10da860fcff71886af91d082e31f0e1917926848
parent b141fb62850c2a181895c89a94c50f44946c8cca
parent 24f642634719f106c95a9cc19a7b80c0ad4d6c68
author Mark Brophy <mbrophy@google.com> 1422666448 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422666448 +0000

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

* commit '24f642634719f106c95a9cc19a7b80c0ad4d6c68':