tree a34b146e4c7fe62825c6ea6869dbd4870ef43763
parent 24f642634719f106c95a9cc19a7b80c0ad4d6c68
parent 6551b7ef07b4d73c096cbfb22002e080b498cbbb
author Adam Cohen <adamcohen@google.com> 1407771944 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1407771944 +0000

am 6551b7ef: Merge "Updating the widget tray" into ub-now-porkchop

* commit '6551b7ef07b4d73c096cbfb22002e080b498cbbb':
  Updating the widget tray