tree 59d207255fbdb8b3d4ef2676f7d90232324af82c
parent b4eb3d800544d9e628ff182070ceb0213b835752
parent 42caec28ab1393853c342a989ec844846235013f
author Doug Zongker <dougz@google.com> 1343945835 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1343945835 -0700

am 42caec28: am 1e845d33: Merge "add extra args to mkbootimg" into jb-mr1-dev

* commit '42caec28ab1393853c342a989ec844846235013f':
  add extra args to mkbootimg