Commits
Merge remote 'aosp/android-5.4' v5.4.3 into lf-5.4.y_android Conflicts: arch/arm/mm/dma-mapping.c arch/arm64/mm/dma-mapping.c sound/soc/soc-pcm.c Change-Id: Idb9ab59fac100c29d5fb2ee37bd48d8ec411af1e
Merge remote 'aosp/android-5.4' v5.4.3 into lf-5.4.y_android Conflicts: arch/arm/mm/dma-mapping.c arch/arm64/mm/dma-mapping.c sound/soc/soc-pcm.c Change-Id: Idb9ab59fac100c29d5fb2ee37bd48d8ec411af1e