| commit | 90cf34c72e204eb1d23f43d1fccbf2076e8ff67b | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Tue Jul 13 17:24:09 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 13 17:24:09 2010 -0700 |
| tree | ec70f242d3c8207ac5abb5d76c33ab53315322fb | |
| parent | 1778b4b11effa15b3b540a5153f68127a9ec6adb [diff] | |
| parent | f0f60cdd8f4f74b2480774887606afdebec8d891 [diff] |
am f0f60cdd: resolved conflicts for merge of 1a08100f to gingerbread Merge commit 'f0f60cdd8f4f74b2480774887606afdebec8d891' into gingerbread-plus-aosp * commit 'f0f60cdd8f4f74b2480774887606afdebec8d891': Support to build native libraries with prebuilt NDK