tree 10da860fcff71886af91d082e31f0e1917926848
parent b6f40305a524512fcc1dac175ba57f7c41655fd8
parent a027e9c746ecbfb6ae16e4a1fb4ac8745f44906f
author Adam Cohen <adamcohen@google.com> 1422666449 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422666449 +0000

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

* commit 'a027e9c746ecbfb6ae16e4a1fb4ac8745f44906f':