OSDN Git Service

am 91624eae: am 57866a6d: Merge changes Iea8d03de,I2014f959
authorJosh Gao <jmgao@google.com>
Thu, 17 Sep 2015 22:31:45 +0000 (22:31 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 17 Sep 2015 22:31:45 +0000 (22:31 +0000)
* commit '91624eae9aa90e123ae37843d94861120d2433a4':
  Implement setjmp cookies on x86_64.
  Implement setjmp cookies on x86.


Trivial merge