Scott Main b1ddc7ec5c resolved conflicts for merge of 9bf45a00 to honeycomb-plus-aosp ...

Change-Id: I2b2957346a99d5601005831a41033a355df5b163

2011-02-07 21:17:09 -08:00

..

accessing-resources.jd

…

animation-resource.jd

…

available-resources.jd

…

color-list-resource.jd

…

drawable-resource.jd

Doc change: fixing links set 2

2011-01-07 18:56:10 -08:00

index.jd

…

layout-resource.jd

cherrypick Change-Id: Icf74572932165270a93243f4a109979807b495df

2010-12-14 16:39:22 -08:00

localization.jd

…

menu-resource.jd

update menu dev guide with more info about action bar

2011-02-03 18:02:55 -08:00

more-resources.jd

cherrypick Change-Id: I52bc4e2d34015e6e30887590f920b580a034180e

2010-12-14 17:34:00 -08:00

providing-resources.jd

am a8069f34: Merge "Fixes Keyboard availability in "Providing Resources" documentation page."

2011-01-21 09:55:16 -08:00

resources-i18n.jd

…

runtime-changes.jd

Finish the app fundamentals rewrite by updating the side nav and resolving links in the dev guide

2011-02-07 21:03:04 -08:00

string-resource.jd

…

style-resource.jd

…