Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb
author黄涛 <huangtao@rock-chips.com>
Wed, 25 Jul 2012 06:19:53 +0000 (14:19 +0800)
committer黄涛 <huangtao@rock-chips.com>
Wed, 25 Jul 2012 06:19:53 +0000 (14:19 +0800)
commitf58192d21d6df9d0b633ff9ebf193bd10b818313
tree42fcae76929b2da295544dc475b730e7a27baa29
parenta6ea2fea1e73a0cfdd6de86f88a75663fe161ccb
parent1b5128e3dda2564a30f98aa1b95635cefeaa7749
Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb