OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 10 Aug 2010 03:28:14 +0000 (20:28 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 10 Aug 2010 03:28:14 +0000 (20:28 -0700)
commitb7db029b2b35532786d9d0fb7aadfbdb41cd6972
tree97e6c6fcdb21b3645dbbba03169ddcc4cf39c755
parentddd635030571cec940687a2037b3fd37b03a5fa0
parent271fe07ba885bd17784c0a28e4a5b6b7c3034015
merge from open-source master

Change-Id: I83aa7f88ba7390781d0045bff3a629b71c3143a0