Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb
author黄涛 <huangtao@rock-chips.com>
Sat, 14 Jul 2012 06:25:50 +0000 (14:25 +0800)
committer黄涛 <huangtao@rock-chips.com>
Sat, 14 Jul 2012 06:25:50 +0000 (14:25 +0800)
commitaa0e2f856a8f82a31ec74955c11808193bb66941
tree9a0c2ce1fb107eb9ee472babef07912f7a70b398
parent4542b0b71299e2d96008400c2c93bedd567a3899
parent1690f2c24372885c3bc16cc07b97e4aad750973d
Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb