tree 95639273dd28b75ba8c16690773d44c385342e31
parent f4e03b03656527caf88b9e582ab5ca19ae697700
parent 2a34009f109a504d3623abf75d7087a0d6474e59
author Christopher Ferris <cferris@google.com> 1384908500 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384908500 -0800

am 2a34009f: Merge "Add .cfi_startproc/.cfi_endproc to ENTRY/END."

* commit '2a34009f109a504d3623abf75d7087a0d6474e59':
  Add .cfi_startproc/.cfi_endproc to ENTRY/END.