tree 5f2dd8e41152fd9235f92ad8b3f1f4e29c6d32d2
parent 4fbecd297ab642c56c94fc7b73348742ff19dac3
parent 4eb4c932dccdca663a651630fed14c760ea1e88c
author Steinar H. Gunderson <sesse@google.com> 1295295539 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1295295539 -0800

am 4eb4c932: am f4dca7be: Backport (simple cherry-pick) 64b6c43379dba176659bc1313b6bb488ac94cfd6 to gingerbread.

* commit '4eb4c932dccdca663a651630fed14c760ea1e88c':
  Backport (simple cherry-pick) 64b6c43379dba176659bc1313b6bb488ac94cfd6 to gingerbread.