tree 6e192f4ba72f76d3e67d86299ccad2d570653385
parent d80f8258a627b5a67da210595f939465d8aa3327
parent 5337aea1536c11e5bfef49a14297fd4649baa3a3
author Mark Brophy <mbrophy@google.com> 1407761174 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1407761174 +0000

am 5337aea1: Merge "Revert "Updating the widget tray"" into ub-now-porkchop

* commit '5337aea1536c11e5bfef49a14297fd4649baa3a3':
  Revert "Updating the widget tray"