tree 466e12697e6a9e1b558406532a17c0034bd9f408
parent f681be949fbb326a24b7b3ae8d329f5f62d86f5a
parent 78fbf9871d3c377360b209ac73b0d6bb63480612
author Michael Jurka <mikejurka@google.com> 1365099360 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1365099360 -0700

am 78fbf987: Merge "Fix occasional widget flashing" into jb-mr2-dev

* commit '78fbf9871d3c377360b209ac73b0d6bb63480612':
  Fix occasional widget flashing