tree bea0061047b2e011e77a3077758ade030d7c9a06
parent 5d386a1ae28084626f2e207add4be6912db033ce
parent b1ddc7ec5cd28595948644140b77bda282b7df6d
author Scott Main <smain@google.com> 1297142423 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1297142423 -0800

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