tree 273b4b3aa02796bc8bdd73e40e26d81c25fa5e25
parent 13f733710cc84ce0a627f4de6cb9ca79562df81d
parent 585273e28f02c479f077367e0b9122996e2b1161
author Adam Cohen <adamcohen@google.com> 1422669670 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422669670 +0000

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

* commit '585273e28f02c479f077367e0b9122996e2b1161':