tree 10da860fcff71886af91d082e31f0e1917926848
parent 546e1954f2cede59d2dab3b588da261ea8d3b1fd
parent 50048c4e60fdb837070d0487a95d5dbd32f67458
author Adam Cohen <adamcohen@google.com> 1414566321 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566321 +0000

am 50048c4e: am 9f1f28f3: am 3779419c: am fc7c350c: am 8590ecd2: Merge "Fix issue with adding widget with config activity to empty screen (issue 11381059)" into jb-ub-now-jetsonic

* commit '50048c4e60fdb837070d0487a95d5dbd32f67458':