tree 10da860fcff71886af91d082e31f0e1917926848
parent da8522d929d79be0149112717d2ad1113209919b
parent 4cfc7a91485fd80297c33e03e094c51bca4c1280
author Adam Cohen <adamcohen@google.com> 1422666446 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422666446 +0000

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

* commit '4cfc7a91485fd80297c33e03e094c51bca4c1280':