tree 6f13fee551f4d7cf257d0561eeb3bddd0b6c381d
parent 44beb1445f55b09096f7d264c92d86890888b971
parent 7bb1749c69384faf00b238f0684d3b2e23406451
author Joe Onorato <joeo@android.com> 1253903132 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1253903132 -0700

am 7bb1749c: work around and fix bugs

Merge commit '7bb1749c69384faf00b238f0684d3b2e23406451'

* commit '7bb1749c69384faf00b238f0684d3b2e23406451':
  work around and fix bugs