Merge remote branch 'wlf/develop-3.0-rk2928' into develop-3.0-rk2928
authoryangkai <yk@rock-chips.com>
Tue, 31 Jul 2012 02:41:29 +0000 (10:41 +0800)
committeryangkai <yk@rock-chips.com>
Tue, 31 Jul 2012 02:41:29 +0000 (10:41 +0800)
commit5c6d7432003aa4a96af3d2d14ebf2f3f9a0dd3dd
treeda786d1aa0940fe56deda8b5188c2fcd1f80a2b2
parent78c5e1c2bec66fd20a1f3cef8db2ffdd2982cc2a
parentde3f7c318ec7a893671504b564130db329b8ded3
Merge remote branch 'wlf/develop-3.0-rk2928' into develop-3.0-rk2928