tree 62be4eec4bf74d8ecfc26ee7dcda8e72b30150b0
parent c3f7b4ec15b7462bb1d010d226192201cbe84ca0
parent 71ab1c960202f0572d6f43d94e64d3c2e3ea7292
author Mathieu Chartier <mathieuc@google.com> 1437678908 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437678908 +0000

am 71ab1c96: am 20cd654b: Merge "Fix alignments in quick_entrypoints_x86_64.S"

* commit '71ab1c960202f0572d6f43d94e64d3c2e3ea7292':
  Fix alignments in quick_entrypoints_x86_64.S