Dirk Dougherty a97e177857 Merge commit '47d3eaf6' into manualmerge ...

Conflicts:
	docs/html/design/patterns/accessibility.jd
	docs/html/design/patterns/actionbar.jd
	docs/html/design/patterns/compatibility.jd
	docs/html/design/patterns/multi-pane-layouts.jd
	docs/html/design/style/iconography.jd

Change-Id: I349cf8ebc159c0a7ef0796900e2d11fe6e0c888a

2014-02-12 19:31:15 -08:00

..

admin

Removing quotes from page.tags values

2013-11-14 21:00:10 +00:00

appwidgets

Removing quotes from page.tags values

2013-11-14 21:00:10 +00:00

connectivity

am b8928b05: am 987ac90d: am ed8d921a: am eec66178: am 73c1681b: Merge "Docs: Clean up HCE dev guide" into klp-docs

2013-12-16 23:27:57 +00:00

data

am 6652ef46: am dd55de3d: am 9767f9e2: am 7df86ef4: am 9e36f588: Merge "update storage doc for secondary external storage in KK and add some new sample code and remove documentation for APIs below level 8 and add information about permission changes in KK bug: 1190750

2013-12-17 22:10:05 +00:00

graphics

Removing quotes from page.tags values

2013-11-14 21:00:10 +00:00

location

Doc change: updates to location landing.

2013-05-15 06:31:48 -07:00

manifest

Merge commit '47d3eaf6' into manualmerge

2014-02-12 19:31:15 -08:00

media

am 8853b9c4: am 577570f2: am e5dc0c39: am 5b97ec6f: am 3885b00a: am f25bc75f: Merge "MediaRouter Developer Guide" into klp-docs

2014-02-13 01:11:51 +00:00

processes

…

providers

Doc update: removed the word "new".

2013-12-11 18:17:28 -08:00

renderscript

Add message to RS docs about application vs. library packaging.

2014-01-30 19:43:20 -08:00

resources

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

search

Removing quotes from page.tags values

2013-11-14 21:00:10 +00:00

security

initial shuffle of the API guide nav to add introduction

2013-12-17 13:14:17 -08:00

sensors

Removing quotes from page.tags values

2013-11-14 21:00:10 +00:00

text

Removing quotes from page.tags values

2013-11-14 21:00:10 +00:00

ui

am ca2d8954: am 82ec0954: am afe90d80: am 7dde7879: am 1a21c16b: Merge "docs: Fixed typo in AlertDialog code snippet." into klp-docs

2014-01-14 17:49:43 +00:00