tree 8c0965ef2c507eeba0c34a2b8f37d03a72ae676d
parent 4eb4c932dccdca663a651630fed14c760ea1e88c
parent 2e23e29245aa42d0f9419187c94e72dba3888eef
author Steinar H. Gunderson <sesse@google.com> 1295295345 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1295295345 -0800

am 2e23e292: Backport (simple cherry-pick) d33019030c1f0cddca557f9659e3c471bde0e6a9 to gingerbread.

* commit '2e23e29245aa42d0f9419187c94e72dba3888eef':
  Backport (simple cherry-pick) d33019030c1f0cddca557f9659e3c471bde0e6a9 to gingerbread.