OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 21 Apr 2010 16:10:10 +0000 (09:10 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 21 Apr 2010 16:10:10 +0000 (09:10 -0700)
commitd428e48aa1295519c49ace23905c2acf5a625ccc
tree0d4e0835fb1817c92a867edaecd822651b2794f9
parent03f73ba453ca0da5805a2817c4440fbc1944d880
parent3d96f18dd1f60d9ceca29cbce07e4572b03d2a97
merge from open-source master

Change-Id: Ia811827c7fce6b14ec6f8f9dc5f5305be6138127