tree 5cdb26a41f504b1a4d9c0631f6294a2c0545858e
parent 596a4233846492ee3c3d63fd7c7cf56796960c92
parent 27517b2158a7fcdae13ff02d4cbefa79afbdb838
author Ying Wang <wangying@google.com> 1262814360 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1262814360 -0800

am 27517b21: Still use ro.monkey

Merge commit '27517b2158a7fcdae13ff02d4cbefa79afbdb838' into eclair-plus-aosp

* commit '27517b2158a7fcdae13ff02d4cbefa79afbdb838':
  Still use ro.monkey