| commit | aabbc07cb84b1693b5876d8f4bf4d21a4940681d | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Tue Jul 13 17:26:00 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 13 17:26:00 2010 -0700 |
| tree | aa37e77f18b0161cc039a950fad9f5323d2faf8b | |
| parent | dd0af2517ceb29736858ef74e3e8431994429cc8 [diff] | |
| parent | 90cf34c72e204eb1d23f43d1fccbf2076e8ff67b [diff] |
am 90cf34c7: am f0f60cdd: resolved conflicts for merge of 1a08100f to gingerbread Merge commit '90cf34c72e204eb1d23f43d1fccbf2076e8ff67b' * commit '90cf34c72e204eb1d23f43d1fccbf2076e8ff67b': Support to build native libraries with prebuilt NDK