OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 28 Sep 2010 22:14:12 +0000 (15:14 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 28 Sep 2010 22:14:12 +0000 (15:14 -0700)
commit208883fa5b5870f36919689db63af6285cd723c8
tree87983f868cb134e9638f3e43bda50454051bd623
parent40e6b6c82e8ebf59f54ea8cf6d24c05f86589644
parentfc4d86f86f9ae959d8281e5179f2bc5cb037dfe8
merge from open-source master

Change-Id: I4d60cd73d8d69877fe5256478865ce75d9b600fa