Nick Kralevich 0ae82b05be resolved conflicts for merge of a4eb81b6 to lmp-dev ...

Change-Id: I73b225141e09826b40e4941140b59d1c163bd9c7

2014-10-14 08:38:05 -07: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

am ede1910a: am ddf853e0: am 7f6af88e: Fixed a randomly discovered typo and missing hyphen. Change not staged.

2014-07-16 13:35:25 +00:00

location

…

manifest

DO NOT MERGE

2014-07-22 18:16:39 +00: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 some documentation typos.

2014-09-30 02:52:26 +00:00

search

…

security

…

sensors

…

text

am 42dbe809: am af001f94: am 170b0953: Merge "Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body." into klp-modular-docs

2014-07-22 20:55:55 +00:00

ui

am a1a3c8a1: am 9de22952: am ab833be6: Merge "docs: Fix bug with Accessibility Services dev guide" into klp-modular-docs

2014-09-03 23:36:30 +00:00