tree 1cd1073b6839facaadadba3a914612c5853fb7a5
parent 0ba03bc350414c21d318a22b3429f832bb648521
parent a0c7a5765dbbd255f9a122ba8829ca44032acde0
author Adam Cohen <adamcohen@google.com> 1316760281 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1316760281 -0700

am a0c7a576: am 08ee7fa4: Merge "Fixing emergency dialer flicker on lock screen (issue 5314293)" into ics-factoryrom

* commit 'a0c7a5765dbbd255f9a122ba8829ca44032acde0':
  Fixing emergency dialer flicker on lock screen (issue 5314293)