Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb
author黄涛 <huangtao@rock-chips.com>
Tue, 31 Jul 2012 06:16:32 +0000 (14:16 +0800)
committer黄涛 <huangtao@rock-chips.com>
Tue, 31 Jul 2012 06:16:32 +0000 (14:16 +0800)
commit91f521d23ddd1307b7c44c00597412f307b40ab5
treee4affa10338a395e5ed99be5f235d978bdb51a25
parent71ee502281c88db9562586404202d216c3c27bf9
parent8aa69d7611dfa1296ae4adf0b5987e0a1851c537
Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb