OSDN Git Service

Merge "Fix x86-64 __memset_chk." am: 7d188ce0fe am: 6ac4d0a054
authorElliott Hughes <enh@google.com>
Fri, 4 Mar 2016 03:24:52 +0000 (03:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 4 Mar 2016 03:24:52 +0000 (03:24 +0000)
am: d0a467e9f0

* commit 'd0a467e9f034461a26f909365918936b56e08808':
  Fix x86-64 __memset_chk.


Trivial merge