OSDN Git Service

am 5630521a: resolved conflicts for merge of 3e91f5ad to jb-mr1-dev
authorAndrew Hsieh <andrewhsieh@google.com>
Wed, 12 Sep 2012 22:42:38 +0000 (15:42 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 12 Sep 2012 22:42:38 +0000 (15:42 -0700)
commit01be4e6670eef141ed94baa61eb881df46cab66c
treee98a11812008c753ac2e01e84f3301967532d221
parentfc3f4921066a2a8171a66b5ffec85c3c3a6235bf
parent5630521aba12a03637e7328686924df4d298ff4d
am 5630521a: resolved conflicts for merge of 3e91f5ad to jb-mr1-dev

* commit '5630521aba12a03637e7328686924df4d298ff4d':
  Enable stack-protector for x86