OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 6 Dec 2010 19:58:32 +0000 (11:58 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 6 Dec 2010 19:58:32 +0000 (11:58 -0800)
commit3225819eb75711cfe46ef99f1a4f1508fcc088ac
treedc00a97bd954f6963e1a5a96f229f5467147264e
parent193e93d2badf04b1d9e865c4c74619ba32196d9f
parent90b6045294b33e87e972a49f587f1e2e78686c9a
merge from open-source master

Change-Id: I5a05ec6c6dca06af72779d6c4d66efcaba8abd10