OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Sun, 10 Oct 2010 20:56:19 +0000 (13:56 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Sun, 10 Oct 2010 20:56:19 +0000 (13:56 -0700)
commitaaa6e06a95e46f7975e01fd5c145a9d6b29c1639
tree757760bf9a0ab419aeab802e4859bf1b113f0930
parentc4fc23757deb6f5b045e8a7c79493941977e8c26
parent0be9e4aa0144016b655dcf6022646e9dface5075
merge from open-source master

Change-Id: I94c5a64731eff54534bd729ee8cdd3437da524ca