OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 17 Jun 2010 16:58:22 +0000 (09:58 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 17 Jun 2010 16:58:36 +0000 (09:58 -0700)
commitaa90e9eac8211165d52cdba7b7a9d3102bf217f7
tree6ad0ad09316ec24158a0a829507d6b9ce70b7534
parent8aeb7cc4614147adaa70a9c270c68737afb4c3f7
parent7ef314546ba57a371c7d78f95845322bccfa0786
merge from open-source master

Change-Id: I55d36474223c79e6ab5000b2cb09b01762eb3823