tree b5b9b2170fa18c591646686faf38b11c10605418
parent 8af7c5df575b1aef496694effea19700f6c71d65
parent 538d7d838d82e29c738145431aa64c587dc84943
author Elliott Hughes <enh@google.com> 1419942571 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1419942571 +0000

am 538d7d83: Merge "Fix missing #includes in bootable/recovery."

* commit '538d7d838d82e29c738145431aa64c587dc84943':
  Fix missing #includes in bootable/recovery.