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)
commit040cf4804ab5de1d095b709102d4f910f7984906
tree3f577ed8df07bfa8bcce2a78a4c1554c8b38ab14
parentd03390bfcdb71807a537254455a2938322926d57
parent59a94c106e66d0dbac82f7c57a25ba3ebe597896
Merge branch develop-3.10 into develop-3.10-next