tree 028f317cdd843f005a2edf3ffa16bfa4e0e563d1
parent 6a8a8b87464a4a982cff0e6e0aaeb043d1fd4339
parent 6bb8f476862db17adb6f69b441af9059b01c9108
author Elliott Hughes <enh@google.com> 1419942990 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1419942990 +0000

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

* commit '6bb8f476862db17adb6f69b441af9059b01c9108':
  Fix missing #includes in bootable/recovery.