tree c028bfe537607823c37e2ffc8c713c73059d3130
parent e2762cdfd1bb08047be7d8ff31c9c8519742b833
parent d09f90dda468ed53c657f4c5871fac5cd7e3c3cf
author Adam Cohen <adamcohen@google.com> 1422685279 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422685279 +0000

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

* commit 'd09f90dda468ed53c657f4c5871fac5cd7e3c3cf':