tree e2f9fca0d3684a7a2dc0b92271c59908312166bf
parent f5fc8b06014bc763d26cc0cfcf0073a1edccfc4a
parent 53a8ae6060ad02b9e2747455d3b5e4229a82e051
author Ying Wang <wangying@google.com> 1260989261 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260989261 -0800

am 53a8ae60: Merge changes I84cafc84,Idc388c56 into eclair-mr2

Merge commit '53a8ae6060ad02b9e2747455d3b5e4229a82e051' into eclair-mr2-plus-aosp

* commit '53a8ae6060ad02b9e2747455d3b5e4229a82e051':
  Package blacklist/whitelist file support for Monkey.