Merge remote-tracking branch 'rk/develop-3.10' into develop-3.10
authorroger <cz@rock-chips.com>
Mon, 22 Sep 2014 07:33:13 +0000 (15:33 +0800)
committerroger <cz@rock-chips.com>
Mon, 22 Sep 2014 07:33:13 +0000 (15:33 +0800)
commit0c5ac925e3274c1a049522c0dc576a65c8692d18
treef74903a553ca5957df9fb45fb9bcd1f4fc3fe203
parent46dcf30869a707a193ae5a8339669cb3b3cb0704
parent67decff741763da862b7436a4fe84517c7edc660
Merge remote-tracking branch 'rk/develop-3.10' into develop-3.10