commit | fe03708ed2f477e02d2e91a5e9ed4cd2f2ae563f | [log] [tgz] |
---|---|---|
author | Scott Main <smain@google.com> | Mon Feb 07 21:20:23 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Feb 07 21:20:23 2011 -0800 |
tree | 55c3aa1bb64fb7d5886dcfeeae34ffad7206e34d | |
parent | 2e55800e0f77535976b3f861cdcd80b3f0bfb90f [diff] | |
parent | f452cfb0511df7e0156d8c8957d9cbe984b2c599 [diff] |
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