tree f555e358d3f8cbe5d38c49fb372c94e29d9f3007
parent 6e61914670d64e557d3c006d01fe2610df941532
parent 93a1009cc0a525d1c48237cf5abbd9025a19fb36
author The Android Open Source Project <initial-contribution@android.com> 1376518470 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1376518470 -0700

am 93a1009c: (-s ours) Reconcile with klp-release - do not merge

* commit '93a1009cc0a525d1c48237cf5abbd9025a19fb36':
  Add LPM support into vnd_hammerhead.txt