Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb
author黄涛 <huangtao@rock-chips.com>
Thu, 19 Jul 2012 03:14:29 +0000 (11:14 +0800)
committer黄涛 <huangtao@rock-chips.com>
Thu, 19 Jul 2012 03:14:29 +0000 (11:14 +0800)
commitde1f128348ddaf446a3dde66b51b1666f22825cb
tree81e0b52b1a7e2a355a0915ce2bb3fadb33cfe738
parentf30ecbfd21f3a82adab9bc6d7b293c9e5bb23863
parent9ed652e11c35fc9b8291fd21dc00cc9c0de8f77a
Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb