tree 3e45b1b9f2a26d49162992c6d4d4ba1c1fc28a11
parent 8cb4f07ce0a29100fee20b685d2d027dd05c1eb7
parent 44869a7d1715ec022d17f793cd20a5cc7dc34ffa
author guoyin.chen <guoyin.chen@freescale.com> 1446795354 +0800
committer guoyin.chen <guoyin.chen@freescale.com> 1446795354 +0800

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