am b1ddc7ec: resolved conflicts for merge of 9bf45a00 to honeycomb-plus-aosp

* commit 'b1ddc7ec5cd28595948644140b77bda282b7df6d':
  Finish the app fundamentals rewrite by updating the side nav and resolving links in the dev guide Also move the app fundamentals document back to fundamentals.jd TODO: resolve links in the javadocs
tree: 55c3aa1bb64fb7d5886dcfeeae34ffad7206e34d
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE