tree cabd4744f441b05b1e88e23ec83fca66d123e584
parent 07f35d95967a292f7b52a31289c9019751260a72
parent 47580cc01768dcb67ab152915a2e78a98e36b463
author Christopher Ferris <cferris@google.com> 1385057734 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1385057734 -0800

am 47580cc0: am 3c6d1b88: am 2a34009f: Merge "Add .cfi_startproc/.cfi_endproc to ENTRY/END."

* commit '47580cc01768dcb67ab152915a2e78a98e36b463':
  Add .cfi_startproc/.cfi_endproc to ENTRY/END.