tree d1806e8de1aefb26955c885b6764aceb9eb74828
parent 96b5596721f55a157a2f820d9b9a5a4d73e82609
parent 88440c536ba0cfdd42e88378c952eb56f918f4a8
author Ying Wang <wangying@google.com> 1403125770 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403125770 +0000

am 88440c53: am 5d88b3d7: am c4262982: Merge "Use the correct MKBOOTIMG."

* commit '88440c536ba0cfdd42e88378c952eb56f918f4a8':
  Use the correct MKBOOTIMG.