tree cba62d0d64153aa2169651696bc238591341d679
parent 2a4e4fcad342e23492d0d22a0bc287ab07ad7661
parent 9f1f28f316c434c91cad2fb685c287c2f00c2089
author Adam Cohen <adamcohen@google.com> 1414085431 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085431 +0000

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 '9f1f28f316c434c91cad2fb685c287c2f00c2089':