tree 631adf301ff844b712f7f645fd6525a67ee316b0
parent dc0966d7fa1d031158e9834fda3bdf28658a1991
parent 40828eab739af1ddc699d9c96e410ef1f107209d
author Adam Cohen <adamcohen@google.com> 1338339542 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1338339542 -0700

am 40828eab: am 91834235: Merge "Fix NPE when widget configuration activity is rotated (issue 6556784)" into jb-dev

* commit '40828eab739af1ddc699d9c96e410ef1f107209d':
  Fix NPE when widget configuration activity is rotated (issue 6556784)