tree 36279eba1bcbaa4e5650ff4b3a0e06389fd96159
parent 55d791e74eaa8c80b965075d6debc1cfd7bde99a
parent 17b14bd36aba265ac6bffc2626d8db29713d7c45
author Grace Kloba <klobag@google.com> 1263887012 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1263887012 -0800

am 17b14bd3: DO NOT MERGE

Merge commit '17b14bd36aba265ac6bffc2626d8db29713d7c45' into eclair-plus-aosp

* commit '17b14bd36aba265ac6bffc2626d8db29713d7c45':
  DO NOT MERGE