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)

Trivial merge