Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb
author黄涛 <huangtao@rock-chips.com>
Fri, 13 Jul 2012 03:49:29 +0000 (11:49 +0800)
committer黄涛 <huangtao@rock-chips.com>
Fri, 13 Jul 2012 03:49:29 +0000 (11:49 +0800)
commit4542b0b71299e2d96008400c2c93bedd567a3899
treef7b5f49b09a382398c0e415c68225d60134397e7
parent05ad1dacdf1fe8311e8f9d4203a3e3d1e62d8528
parent33246c59d03ae67b6d1dfa2f12a59f4812ae2a32
Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb