| commit | c1b24549e37399aa0b1f0c9d3e33a4b8527fce41 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Jul 12 14:58:50 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 12 14:58:50 2010 -0700 |
| tree | d48698c368f514d4e86244acc01925f45dddcb46 | |
| parent | f3a98c0b2b02d034318af7d4b05164fff8ad0bed [diff] | |
| parent | 87f500004acc7b68745bd939a473dd92e77b5c9c [diff] |
am 87f50000: merge from open-source master Merge commit '87f500004acc7b68745bd939a473dd92e77b5c9c' * commit '87f500004acc7b68745bd939a473dd92e77b5c9c': Define __ANDROID__ for x86 to be on par with ARM build requirements