| commit | 01be4e6670eef141ed94baa61eb881df46cab66c | [log] [tgz] |
|---|---|---|
| author | Andrew Hsieh <andrewhsieh@google.com> | Wed Sep 12 15:42:38 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 12 15:42:38 2012 -0700 |
| tree | e98a11812008c753ac2e01e84f3301967532d221 | |
| parent | fc3f4921066a2a8171a66b5ffec85c3c3a6235bf [diff] | |
| parent | 5630521aba12a03637e7328686924df4d298ff4d [diff] |
am 5630521a: resolved conflicts for merge of 3e91f5ad to jb-mr1-dev * commit '5630521aba12a03637e7328686924df4d298ff4d': Enable stack-protector for x86