OSDN Git Service

am 75c1b73d: am 40090708: am 4547e528: merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 18 May 2010 16:28:28 +0000 (09:28 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 18 May 2010 16:28:28 +0000 (09:28 -0700)
commitf90fa1a04f80d30cd7e06441016a9364f8be75bd
treef4e7a63c53659e849bf44ffc3a45003b1d0f2842
parentf6e9a082a2d7d97bbe45fc7e38fb7ea2a62f39ac
parent75c1b73d53a7666d29e4ac0a8d33b786ebe2b636
am 75c1b73d: am 40090708: am 4547e528: merge from open-source master