Merge commit '42c98ada113ae5b7c72ecb6d0de721ec1d0d3534' into eclair-plus-aosp * commit '42c98ada113ae5b7c72ecb6d0de721ec1d0d3534': Still use ro.monkey
Merge commit '42c98ada113ae5b7c72ecb6d0de721ec1d0d3534' into eclair-plus-aosp * commit '42c98ada113ae5b7c72ecb6d0de721ec1d0d3534': Still use ro.monkey