| commit | 47de55ab634c08a1554adb50423cefc15235d600 | [log] [tgz] |
|---|---|---|
| author | David 'Digit' Turner <digit@google.com> | Mon Jul 11 16:19:55 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 11 16:19:55 2011 -0700 |
| tree | 8c64b09a7568ff5846b3000668c71b8774ffa0d1 | |
| parent | 51c0ca53011b86464dcf14aeb33944a69861a8f4 [diff] | |
| parent | 0ca6912acf53a4081b9312d3b628a87f81dadc52 [diff] |
am 0ca6912a: resolved conflicts for merge of a0cd2ea1 to gingerbread-plus-aosp * commit '0ca6912acf53a4081b9312d3b628a87f81dadc52': Don't set ARM flags for non arm builds