| commit | 798dc2f5189075dd8528adf6472f98a75aeafde6 | [log] [tgz] |
|---|---|---|
| author | Dirk Dougherty <ddougherty@google.com> | Mon Jul 12 17:45:12 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 12 17:45:12 2010 -0700 |
| tree | c44b252bccb7676e731f2dfc375bae5674036214 | |
| parent | 8335619363c6cc0f14ab78d2806dbbddb2cacb30 [diff] | |
| parent | 6ba9e6fbef64da3dacb66e2833ce847e94694d7e [diff] |
am 6ba9e6fb: am 5a93032d: doc change: resolved conflicts for merge of 3c691a8d to gingerbread Merge commit '6ba9e6fbef64da3dacb66e2833ce847e94694d7e' * commit '6ba9e6fbef64da3dacb66e2833ce847e94694d7e': Doc change: add notes for ndk r4b.