Scott Rowe 188a8774c9 resolved conflicts for merge of ea0137ef to lmp-mr1-dev ...

Change-Id: If0a38ebe4e72ec6c1a3683fab1302ee0fdfe4214

2015-01-06 19:30:11 -08:00

..

admin

am 4d50fde5: am 6208e7b5: am 1014b9aa: Merge "docs: remove references to resource browser; point to SDK instead" into klp-modular-docs

2014-08-29 21:33:11 +00:00

appwidgets

…

connectivity

resolved conflicts for merge of a4eb81b6 to lmp-dev

2014-10-14 08:38:05 -07:00

data

…

graphics

docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21

2014-11-07 16:05:13 -08:00

location

…

manifest

resolved conflicts for merge of ea0137ef to lmp-mr1-dev

2015-01-06 19:30:11 -08:00

media

Deprecate android.hardware.Camera

2014-07-13 21:45:57 -07:00

processes

…

providers

…

renderscript

am cb16b55b: am 2a866f07: Update RenderScript docs.

2014-08-26 17:51:21 +00:00

resources

Fix and be more explicit about plurals best practices.

2014-11-19 16:38:39 -08:00

search

docs: Making TV Apps Searchable - new training

2014-12-19 15:15:04 -08:00

security

…

sensors

…

text

Fixes linebreaks that had gotten altered during the run-up to 5.0 release.

2014-10-28 16:38:11 -07:00

ui

docs: Fix typo, use --> user

2014-12-04 22:23:30 +00:00