diff options
| author | David 'Digit' Turner <digit@google.com> | 2011-07-13 14:55:24 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-07-13 14:55:24 -0700 |
| commit | 23a22e9a09b67902c1183c95e6d93e418437c71b (patch) | |
| tree | da0b8059609dda8ace29be4808b8a70e73bda633 | |
| parent | 294b456a3692cd69f45713bc8e9700132a0e5aec (diff) | |
| parent | 47de55ab634c08a1554adb50423cefc15235d600 (diff) | |
| download | external_libnfc-nxp-23a22e9a09b67902c1183c95e6d93e418437c71b.zip external_libnfc-nxp-23a22e9a09b67902c1183c95e6d93e418437c71b.tar.gz external_libnfc-nxp-23a22e9a09b67902c1183c95e6d93e418437c71b.tar.bz2 | |
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
0 files changed, 0 insertions, 0 deletions