tree a5da0e91f4ba7c4bd7cdbddfa0c5ffcb43d41f50
parent 1f4d40be5d9ccaed6e60b2f511b22f8f31a75ef1
parent 711fe35574d5c2f7a668db1ca69a0ce13362fd31
author Greg Hartman <ghartman@google.com> 1415674515 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415674515 +0000

am 711fe355: Add a hook for the syslinux bootloader. automerge: 4c46710

* commit '711fe35574d5c2f7a668db1ca69a0ce13362fd31':
  Add a hook for the syslinux bootloader.