| commit | ec3f4970388df516704893d617122ead771d160e | [log] [tgz] |
|---|---|---|
| author | Dirk Dougherty <ddougherty@google.com> | Mon Jul 12 17:42:33 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 12 17:42:33 2010 -0700 |
| tree | d639253e40fa74e89904db81aa11e741ecfc5276 | |
| parent | 2cb8e28d393dfd4d5d149756a6d4cd0cb213ed9c [diff] | |
| parent | 8728c6a5485c611f7af72b1ffb6eb6b14821846d [diff] |
am 5a93032d: doc change: resolved conflicts for merge of 3c691a8d to gingerbread Merge commit '5a93032dcbe54223e03102d497d7e04370491737' into gingerbread-plus-aosp * commit '5a93032dcbe54223e03102d497d7e04370491737': Doc change: add notes for ndk r4b.