OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 15 Oct 2010 21:23:02 +0000 (14:23 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 15 Oct 2010 21:23:02 +0000 (14:23 -0700)
commita2d358a21054e64fbc87d4db9f1dcde534c1e4c0
treeac7818cdfebba5d36cea8961a6fe7e9a1c5841db
parent4a2690bfe21c058e3e9c080d7b9304c70bf507e7
parentb871eeac402d893e29de4db88be8ce55a6902bff
merge from open-source master

Change-Id: Ib348e701b2298d9154a5a0e662d4ec267bccd64a