tree cd6ff42d2113f6892e08a9d0db6b3c0b96e8444d
parent a2762964900793319da04abcc86b1d6618e1ae51
parent 564c993069fe049a755be7ecffa510fe64a1917e
author Ying Wang <wangying@google.com> 1260990766 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260990766 -0800

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

Merge commit '564c993069fe049a755be7ecffa510fe64a1917e'

* commit '564c993069fe049a755be7ecffa510fe64a1917e':
  Package blacklist/whitelist file support for Monkey.