OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 21 Jan 2010 19:21:28 +0000 (11:21 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 21 Jan 2010 19:21:28 +0000 (11:21 -0800)
commit352926aa3a8ca45dae3e03a6e0ef6cc6b588e8df
tree0af558750b471f5a9dad3934b94cc174c09066d1
parent456a2b86298bb0b6a845683985f8bd625805be51
parentedf8fcfb3a2114914d681c61e2a14896ba776007
merge from open-source master