OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 19 May 2010 15:15:54 +0000 (08:15 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 19 May 2010 15:15:54 +0000 (08:15 -0700)
commitaa2fe148496858e17d0ffd2b8d5d29b89d400934
tree1c2dc0fddaf8d858bd60d5ca2e35614cad90d003
parent7361b7410f2427022cc8917b00553dc26107cded
parent38581c9d1da8a6f31c507f693ed5a349995ec35c
merge from open-source master

Change-Id: I34e8339dcf1bf658703d0d2f9656ceb66594af22