tree 9dae35e899b2946b49b2f5d6caa16b8a17e52d95
parent eea318c3e15ee5e051de0bbdf421a6f74c77931c
parent 7b6c0da3292857af8f6126b9b2450dca606034e3
author Michael Jurka <mikejurka@google.com> 1365099651 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1365099651 -0700

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

* commit '7b6c0da3292857af8f6126b9b2450dca606034e3':
  Fix occasional widget flashing