OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 2 Jul 2010 18:40:01 +0000 (11:40 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 2 Jul 2010 18:40:01 +0000 (11:40 -0700)
commit424d027b6e9b2fff2e79b2d65575c00fcf67d915
tree9b3fb0816d0536e3347a36021cb5420617829d55
parentd6f3185148933e4bae17e8f6efe7610cd1cf7769
parent6fce15cea1145c0359b7103305e215e3e2d1b548
merge from open-source master

Change-Id: I895b74454b35da7eba6c0f6250fe2ca6c9907f1d