tree c7ed85e7d1f17182475da9d336dae9c4257c221a
parent d3ad9828d15f9c8fa435f2d59cd5a18e9ebee100
parent fd0f02ce428880e7dc59ebc94717c3e25d22cbb7
author Mark Brophy <mbrophy@google.com> 1407760977 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1407521747 +0000

Merge "Revert "Updating the widget tray"" into ub-now-porkchop