OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 30 Nov 2010 02:10:13 +0000 (18:10 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 30 Nov 2010 02:10:13 +0000 (18:10 -0800)
commit3d8b8323f5ebcc6c67b77643829cf728631f975e
tree09a54d4c1a5181211485abdd476a47e7076605be
parentb5a0223809b19f245d945d40d8e0a71509a88be9
parentc98df372d5ed6d390da09e30a83672041185c252
merge from open-source master

Change-Id: Ib8ef5125a7206364770f9b28a5923843ed7898a5