OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 19 May 2010 15:13:51 +0000 (08:13 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 19 May 2010 15:13:51 +0000 (08:13 -0700)
commitca81fb411afd93378f01e3e13ef482693fd35a73
tree0bda518e7e6c402b69db873bfd3d732905916182
parent253290a70f2b8f9ca4f0e79b18d9c3f7fe82561b
parent9bfa323af163aa5439eb44c25e50d8366a260da7
merge from open-source master

Change-Id: I4af8f65d1dfff3912f0057645943df78ddefc7ca