OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 30 Nov 2010 23:04:59 +0000 (15:04 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 30 Nov 2010 23:04:59 +0000 (15:04 -0800)
commit74fce0cbc02b1755e1af89a606b9bcc8112d44a9
treebdb8096f2aec9c213724d2715048f08954b98865
parentfa0424d2cad8a059009330e403ce03591a3898e2
parent78338176578c649638ccf0cb897bd26f4aad2d9a
merge from open-source master

Change-Id: Ife0027c5b18435f5188202f801ef49e31cd5c01a