OSDN Git Service

am cafc9480: Merge "Fix addition of extra arg to cfi_restore."
authorChristopher Ferris <cferris@google.com>
Wed, 15 Apr 2015 00:22:59 +0000 (00:22 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Apr 2015 00:22:59 +0000 (00:22 +0000)
* commit 'cafc948069d447aa1e4dde599ee83bf6c0c5d5d8':
  Fix addition of extra arg to cfi_restore.


Trivial merge