OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 24 Nov 2010 01:23:15 +0000 (17:23 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 24 Nov 2010 01:23:15 +0000 (17:23 -0800)
commit7bc477ba2e20b62e4d614d3aa2a8054b2daa7fb6
tree65c7df072a21d44805ac1b29caed7d0208d521f2
parent14e958c2cfa76201e28f61c4fdb60f7f4c4efd9d
parent40bba5bf796b982b941359032645c2cfea1561dc
merge from open-source master

Change-Id: I0a6441de70a779781b68c12433b2390e600c5d2e