Merge branch develop-3.10 into develop-3.10-next
authorHuang, Tao <huangtao@rock-chips.com>
Tue, 9 Dec 2014 07:10:34 +0000 (15:10 +0800)
committerHuang, Tao <huangtao@rock-chips.com>
Tue, 9 Dec 2014 07:10:34 +0000 (15:10 +0800)

Trivial merge