tree 446ced2759cce0516da0fab0b3494f5144af8e80
parent 7704f449c9e9e331c84019bd1bdfd999c8bbc93a
parent f4dca7be3b7bc181f1534be187428c5a52cb8c6a
author Steinar H. Gunderson <sesse@google.com> 1296146941 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296146941 -0800

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

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