OSDN Git Service

Merge changes I84cafc84,Idc388c56 into eclair-mr2
authorAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 16 Dec 2009 18:43:43 +0000 (10:43 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 16 Dec 2009 18:43:43 +0000 (10:43 -0800)
commit53a8ae6060ad02b9e2747455d3b5e4229a82e051
treed50bbb94a920343efa3bb6e8bff78e4d66a70bd3
parent7dbb3c2900e206c1468868e195fc37bf2d4932b1
parentdc388c565be0f539ded2bca165fef347dc7a89cc
Merge changes I84cafc84,Idc388c56 into eclair-mr2

* changes:
  Merge commit 'goog/eclair-mr2' into play-with-monkey
  Package blacklist/whitelist file support for Monkey.