tree b33c545e5446d100029374242f844ec907d96069
parent 38041d6b3c3d838d99f70f9b1195d69487edf689
parent 6868d6f349610c15256471cc3d5fa708cbfd5f1d
author Mathias Agopian <mathias@google.com> 1350359276 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350359276 -0700

am 6868d6f3: Revert "Revert "Fix for bug 6050753.""

* commit '6868d6f349610c15256471cc3d5fa708cbfd5f1d':
  Revert "Revert "Fix for bug 6050753.""