tree 12cdc0f1be3884443d5c93130fb49cd405cbfa64
parent 9230bf3b9a321c84c82489b0c471df7e17a3d931
parent cba9291560815b5d713392e916902dfd0ad91eed
author Jason Chen <jasonchen@google.com> 1298513481 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1298513481 -0800

am 36b0b85a: (-s ours) am 22577b8d: (-s ours) am 5ff79c3b: Merge "DO NOT MERGE Cherry-pick of Ie4026a7c back to GB" into gingerbread

* commit '36b0b85abd20b4f4bea210060dec3fbe80870dd5':
  DO NOT MERGE Cherry-pick of Ie4026a7c back to GB