[automerger skipped] DO NOT MERGE am: d3fb2be4cc  -s ours am: a2dc19ffaf  -s ours
am: 3bbabb4c3a  -s ours

Change-Id: I1dd4482845403f2ee6b6ded1210e29e17a566f71
tree: e956bb15597fdabf960c75d1ff27b87f155b4207
  1. kernel-headers/
  2. original-kernel-headers/
  3. BoardConfigCommon.mk
  4. msm8x09.mk