Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb
author黄涛 <huangtao@rock-chips.com>
Tue, 24 Jul 2012 04:02:49 +0000 (12:02 +0800)
committer黄涛 <huangtao@rock-chips.com>
Tue, 24 Jul 2012 04:02:49 +0000 (12:02 +0800)
commita6ea2fea1e73a0cfdd6de86f88a75663fe161ccb
tree6ec82ba62366520661d81348b7768e9eaff1e457
parent4444b98b85b6cdcf209b48e47d84f3eecd6c7d6c
parent71d45b2e979a8844eddfe796afdb542ece7262ed
Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb