Merge remote-tracking branch 'origin/develop-3.10' into develop-3.10-next
author黄涛 <huangtao@rock-chips.com>
Wed, 22 Oct 2014 11:05:55 +0000 (19:05 +0800)
committer黄涛 <huangtao@rock-chips.com>
Wed, 22 Oct 2014 11:05:55 +0000 (19:05 +0800)
commitc34119d2690a084a6acb10d9bd7f09e7ccbc910d
tree188dd409294c5e11b24e14f63c6343bd818c357e
parent5e8b09aa47fb8dc8ae5c0f80d06e2e2d2bb95c53
parent218243389f6f46420e3bac18e73b08919498b542
Merge remote-tracking branch 'origin/develop-3.10' into develop-3.10-next