tree cb96d341a96c579d202e76af2259553e2cbd2b51
parent 869a96a1cac8f97d1d757149bf5f0832bb1f6331
parent 914811a9f283ed3d8aa826abddf8c11f6167dc14
author Mohamad Ayyash <mkayyash@google.com> 1435189347 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1435189347 +0000

am 914811a9: Merge "Add img2simg in host and ota packages" into mnc-dev

* commit '914811a9f283ed3d8aa826abddf8c11f6167dc14':
  Add img2simg in host and ota packages