commit | fd9caf5b863a652b782782a7e6f177bf2959017f | [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 | 36c3def8b1c1cce764aba6119c7ab0dbbf700f93 | |
parent | 79855d337d874a888f72bd8371afa30f61883ffa [diff] | |
parent | ec3f4970388df516704893d617122ead771d160e [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.