tree 273b4b3aa02796bc8bdd73e40e26d81c25fa5e25
parent 0bee73c07d4662a2b96b56e8667d3e7efb4c188c
parent a02ba57d117591572da7fc019c74dbffb6025853
author Adam Cohen <adamcohen@google.com> 1422669667 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422669667 +0000

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

* commit 'a02ba57d117591572da7fc019c74dbffb6025853':