Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb
author黄涛 <huangtao@rock-chips.com>
Thu, 26 Jul 2012 09:35:10 +0000 (17:35 +0800)
committer黄涛 <huangtao@rock-chips.com>
Thu, 26 Jul 2012 09:35:10 +0000 (17:35 +0800)
commitb3d408cc6dbfa6da2e7a6ddd2fd4cfd94e621069
treec5ad4a3f3ce19813f7c091c0fea634c110ac17bf
parent80419a3794633951a5dbd35c7c9d0be5f80441de
parent6d40f8b587b786c479f1a8161029690dc55f211a
Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb