tree e58d0f856b5de4186fca5b17d79c66b182def8d1
parent 0abab884cc80686c433763bf72db4b371c65649f
parent 19e2f60e4f850661342ff24a87c11f81cb2f2dea
author Ying Wang <wangying@google.com> 1262814966 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1262814966 -0800

am 19e2f60e: am 9c7692aa: Set ro.monkey if it\'s not set yet.

Merge commit '19e2f60e4f850661342ff24a87c11f81cb2f2dea'

* commit '19e2f60e4f850661342ff24a87c11f81cb2f2dea':
  Set ro.monkey if it's not set yet.