tree ff61c89a6202ad1ad7244fc8249c436cd660741a
parent 74ace176fa951f204422168d14d66371026cd65f
parent fbc7922ec87298601ba6a3be1bd9f83ffaf9a233
author Mathias Agopian <mathias@google.com> 1330060982 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1330060982 -0800

Merge changes I97807db6,I7d350bc0

* changes:
  workaround for an issue where the screen would flicker sometimes
  fix an issue in SF where we could miss some updates