tree c028bfe537607823c37e2ffc8c713c73059d3130
parent 5b1cf11a9dcde7852e7bc76956e8f22ea774a1c4
parent c3c336766abee6bb780b5f9022fda7db720b5372
author Adam Cohen <adamcohen@google.com> 1422685283 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422685283 +0000

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

* commit 'c3c336766abee6bb780b5f9022fda7db720b5372':