Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb
author黄涛 <huangtao@rock-chips.com>
Fri, 20 Jul 2012 02:42:06 +0000 (10:42 +0800)
committer黄涛 <huangtao@rock-chips.com>
Fri, 20 Jul 2012 02:42:06 +0000 (10:42 +0800)
commit4444b98b85b6cdcf209b48e47d84f3eecd6c7d6c
tree9e7c864a35f9b3407aab640d015b364c6f001627
parent92bbd51777c39c60867b0c9a6828cb882ea349d7
parent7170054996becee4941213f1f32bb075c77bf1c5
Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb