commit | 23a22e9a09b67902c1183c95e6d93e418437c71b | [log] [tgz] |
---|---|---|
author | David 'Digit' Turner <digit@google.com> | Wed Jul 13 14:55:24 2011 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 13 14:55:24 2011 -0700 |
tree | da0b8059609dda8ace29be4808b8a70e73bda633 | |
parent | 294b456a3692cd69f45713bc8e9700132a0e5aec [diff] | |
parent | 47de55ab634c08a1554adb50423cefc15235d600 [diff] |
am 47de55ab: am 0ca6912a: resolved conflicts for merge of a0cd2ea1 to gingerbread-plus-aosp * commit '47de55ab634c08a1554adb50423cefc15235d600': Don't set ARM flags for non arm builds