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.
tree: 36c3def8b1c1cce764aba6119c7ab0dbbf700f93
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE