OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 29 Nov 2010 23:31:50 +0000 (15:31 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 29 Nov 2010 23:31:50 +0000 (15:31 -0800)
commit3d59b70fe5b3c588381876f10227b456245bf6bc
tree58c64f2135408c7ea998dddfaffe7883953f5044
parent7f8e85905491b4dcaa1daa28e0c0020235417312
parent84fe98990992bfd57d327c05839dff6f8ec585cc
merge from open-source master

Change-Id: I5ac19298cc7a959c840258299d1179f3f06146ce