Merge remote-tracking branch 'origin/develop-3.0-rk30' into develop-3.0
author黄涛 <huangtao@rock-chips.com>
Sun, 25 Mar 2012 07:55:20 +0000 (15:55 +0800)
committer黄涛 <huangtao@rock-chips.com>
Sun, 25 Mar 2012 07:55:20 +0000 (15:55 +0800)
commit632d5636a0351269207d71d907c5a36a960c41b4
tree89abbb59e33910cc98c552f15743ff7a08680521
parent02c04c83363b1f4b8ba95c50e09b60087e7d3609
parent814c2fd800323054bae861b6a7a49f1415d41524
Merge remote-tracking branch 'origin/develop-3.0-rk30' into develop-3.0