OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 9 Sep 2010 01:12:53 +0000 (18:12 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 9 Sep 2010 01:12:53 +0000 (18:12 -0700)
commitc3695dcdbdaa61c3d5efca693ebfc5e55ff344c5
tree0195d26b83c7bda6ac99a63dde1eb82f10e67b20
parent5fbbea470a6fce3fb595997c391d59c94ccd4ec0
parent0bccf12ce5e2f760ea8eb00717c58b9f6578037e
merge from open-source master

Change-Id: I46c62c2477e6c89c4a8ab325301ff165bdce3d31