Dirk Dougherty 9a6672beb1 resolved conflices for merge of 93ccd1a2 to master ...

Change-Id: Ic77367cb9c90027e036a461697295fd604b50014

2014-05-14 14:50:13 -07:00

..

accessing-resources.jd

Doc update: Misc doc bugs

2013-04-02 16:22:39 -07:00

animation-resource.jd

Doc update: clean up ubiquitous typo "the the"

2013-04-03 13:04:06 -07:00

available-resources.jd

…

color-list-resource.jd

…

drawable-resource.jd

add docs for new attributes, including account restriction for restricted profiles

2013-04-25 19:05:55 -07:00

index.jd

Doc change: Updated content for distribute.

2014-05-14 14:10:51 -07:00

layout-resource.jd

Doc update: it's -> its

2013-04-03 15:11:53 -07:00

localization.jd

Doc change: Updated content for distribute.

2014-05-14 14:10:51 -07:00

menu-resource.jd

…

more-resources.jd

docs: Minor typos

2013-01-15 19:33:56 -08:00

overview.jd

…

providing-resources.jd

Introduce new UI_MODE_TYPE_WATCH and qualifier.

2014-04-04 15:21:53 -04:00

resources-i18n.jd

…

runtime-changes.jd

am adb94013: am 8ff1f285: am b7d456d4: am 8d65fc2c: am 8756b0c3: Merge "docs: Updated the retaining an object during conf change. Bug: 10303533" into klp-docs

2014-02-06 21:29:59 +00:00

string-resource.jd

docs: fix some notification code for wear stacks

2014-05-09 17:01:21 -07:00

style-resource.jd

…