OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 21 Sep 2010 21:32:52 +0000 (14:32 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 21 Sep 2010 21:32:52 +0000 (14:32 -0700)
commitf23cf98d33ba2f97284d1f3e39fdc8accb16edf2
tree1a4cc30eaed79d21e94380c52e99e934fa9e6e0c
parent5a1724efffa55dffc452adb490b42c89763f12bf
parentf7b61b07dc2a66eeae9254c3cd974082e4dfbdfd
merge from open-source master

Change-Id: I11840af6a6ec193c80962b5abeb569458601754d