tree 5ee965365573bb7386f522a74eea19015be31e36
parent 2a879d2e05ec4bc05e7bf7093ecf31cdea85c2d4
parent 9076751959397fb06f55fc4351009d105d08de3f
author Adam Cohen <adamcohen@google.com> 1336676239 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1336676239 -0700

am 90767519: Merge "Fix launcher crash when adding widget (issue 6433360)" into jb-dev

* commit '9076751959397fb06f55fc4351009d105d08de3f':
  Fix launcher crash when adding widget (issue 6433360)