tree 43bf576bdaa617f28ab91b693182472f5f8766e2
parent bd36699d8b3eb57e3a064e0789e87853f9574880
parent 858bdb46a51cc462242c946351f75e6476307043
author Rom Lemarchand <romlem@android.com> 1433298538 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433298538 +0000

am 858bdb46: resolved conflicts for merge of 7982495f to mnc-dev-plus-aosp

* commit '858bdb46a51cc462242c946351f75e6476307043':
  mkbootimg: delete obsolete C source