tree 8e1b1a4eda1decf0d3bd29f69263270a95cf3652
parent 9556fb17c32f9c8e40406bb522bf068885ddedf9
parent 77c1376c67ce7e259b8eca77bd5ba8f4fa7d4b86
author Adam Cohen <adamcohen@google.com> 1407723266 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1407723266 +0000

am 77c1376c: Merge "Updating the widget tray" into ub-now-porkchop

* commit '77c1376c67ce7e259b8eca77bd5ba8f4fa7d4b86':
  Updating the widget tray