tree 0dda8d67ae9160f248b2a52c322b0dc754cbdf46
parent 0d16578d750a504ed6cddd0669d26fd5ab3fd490
parent b3e988b838388f901d471a6938d0fb67b9bcad3b
author zhang sanshan <b51434@freescale.com> 1445826369 +0800
committer zhang sanshan <b51434@freescale.com> 1445826369 +0800

Merge remote-tracking branch 'fsl-linux-sdk/imx_3.14.y' into imx_3.14.y_android