OSDN Git Service

am 833ec8ff: Merge "Add proper cfi directives."
authorChristopher Ferris <cferris@google.com>
Wed, 10 Sep 2014 18:26:34 +0000 (18:26 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 10 Sep 2014 18:26:34 +0000 (18:26 +0000)
* commit '833ec8ff84a25078f5755489d7a36db3015c069a':
  Add proper cfi directives.


Trivial merge