OSDN Git Service

am 564c9930: am 53a8ae60: Merge changes I84cafc84,Idc388c56 into eclair-mr2
authorYing Wang <wangying@google.com>
Wed, 16 Dec 2009 19:12:46 +0000 (11:12 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 16 Dec 2009 19:12:46 +0000 (11:12 -0800)
commit91f556a237e865cfe0daa2b467170c58278e4bea
treecd6ff42d2113f6892e08a9d0db6b3c0b96e8444d
parenta2762964900793319da04abcc86b1d6618e1ae51
parent564c993069fe049a755be7ecffa510fe64a1917e
am 564c9930: am 53a8ae60: Merge changes I84cafc84,Idc388c56 into eclair-mr2

Merge commit '564c993069fe049a755be7ecffa510fe64a1917e'

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