Elliott Hughes 4656e69bf3 resolved conflicts for merge of 2008cff7 to lmp-dev-plus-aosp ...

Change-Id: I5148eda624e8504f12dbc1288cd4a7a5b7c10850

2014-09-08 13:08:43 -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

am e70766f3: am e1d8ee41: am ce259483: Merge "Added missing brace."

2014-07-05 17:12:14 +00:00

data

…

graphics

resolved conflicts for merge of 2008cff7 to lmp-dev-plus-aosp

2014-09-08 13:08:43 -07:00

location

…

manifest

resolved conflicts for merge of 2008cff7 to lmp-dev-plus-aosp

2014-09-08 13:08:43 -07: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

am 14f413be: am 048d8baa: am 0ccf80c3: Merge "docs: b/15790433 updated for xxhdpi and xxxhdpi" into klp-modular-docs

2014-09-04 00:20:15 +00:00

search

resolved conflicts for merge of 2008cff7 to lmp-dev-plus-aosp

2014-09-08 13:08:43 -07:00

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

resolved conflicts for merge of 2008cff7 to lmp-dev-plus-aosp

2014-09-08 13:08:43 -07:00