| commit | 24d0796bdec9513f2a5d7f2a8ee1080ae6a7e1fc | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Tue Apr 12 13:27:46 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 12 13:27:46 2011 -0700 |
| tree | 79188770a897032446a0210f38ae8998d15a73e0 | |
| parent | d2fb1cc23e33e6b6c439894566d7ecca4da76b52 [diff] | |
| parent | 91c81750f61fbb5b17112003fc231d16c25ee257 [diff] |
am 91c81750: resolved conflicts for merge of 4d9a8556 to honeycomb-plus-aosp * commit '91c81750f61fbb5b17112003fc231d16c25ee257': Add NDK crtbegin_so.o and crtend_so.o if they exist.