Merge remote-tracking branch 'origin/develop-3.0-jb' into develop-3.0
author黄涛 <huangtao@rock-chips.com>
Tue, 21 Aug 2012 11:55:23 +0000 (19:55 +0800)
committer黄涛 <huangtao@rock-chips.com>
Tue, 21 Aug 2012 11:55:23 +0000 (19:55 +0800)
commit0a3b24f10de08e49e0946aa4ea188f37fe0c97f7
tree14c5a387106444644b14b08ebf7c3ff41bd6d916
parent533b210c3183cf5fba66b4069a6f3965030fe273
parent19b3e31e9135e83aae73d4a1ba455919bc817394
Merge remote-tracking branch 'origin/develop-3.0-jb' into develop-3.0