Dirk Dougherty 798dc2f518 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.
2010-07-12 17:45:12 -07:00
..