OSDN Git Service

resolved conflicts for merge of e85c304f to master
authorAndrew Stadler <stadler@android.com>
Thu, 10 Dec 2009 00:10:02 +0000 (16:10 -0800)
committerAndrew Stadler <stadler@android.com>
Thu, 10 Dec 2009 00:10:02 +0000 (16:10 -0800)
commit675a854b8e28de65e5d6269815947646aaa0477a
tree9437de98b47537ea13f0b680e15dfc2cfe7d8ff4
parent37d1ef23e09e233097878a25966a643bc8e9ccc5
parentf4bc7f89b447755e111ca09c26d8db70c9a601cd
resolved conflicts for merge of e85c304f to master