OSDN Git Service

am 53a8ae60: Merge changes I84cafc84,Idc388c56 into eclair-mr2
authorYing Wang <wangying@google.com>
Wed, 16 Dec 2009 18:47:41 +0000 (10:47 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 16 Dec 2009 18:47:41 +0000 (10:47 -0800)
commit564c993069fe049a755be7ecffa510fe64a1917e
treee2f9fca0d3684a7a2dc0b92271c59908312166bf
parentf5fc8b06014bc763d26cc0cfcf0073a1edccfc4a
parent53a8ae6060ad02b9e2747455d3b5e4229a82e051
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.