OSDN Git Service

Merge commit '27bb6f5f' into manualmerge
authorDoug Zongker <dougz@android.com>
Mon, 1 Mar 2010 20:36:07 +0000 (12:36 -0800)
committerDoug Zongker <dougz@android.com>
Mon, 1 Mar 2010 20:36:07 +0000 (12:36 -0800)
commitb87e0e1d17299dcd1cdbcfbb80d680b5db8a8cd2
tree09cee56c4ce01137e78c72a47bed53abc0d5ee3c
parentf925cb322e693ce2e621dbad3fd1eb8579878710
parent27bb6f5f234332d161a050b32717d94b38e63823
Merge commit '27bb6f5f' into manualmerge