David Gross 95e42d97f4 resolve merge conflicts of ed6625d to stage-aosp-master ...

Change-Id: Icae5872d5e220ac18a35e338f10b194c286855a8

2016-07-21 11:43:15 -07:00

..

admin

docs: work minisite

2016-05-16 13:36:55 -07:00

appwidgets

…

connectivity

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

data

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

graphics

Merge "Revert "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31"" into lmp-docs am: 36785ff4bd am: b6f51341e8 am: f6987bc94c am: 8fc4c789f1 am: c387613d53 am: f7688a4f29

2016-05-19 18:45:25 +00:00

location

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

manifest

Merge \\"Correct parentActivity example in Activity Element docs.\\" into mnc-io-docs am: 893413e50c

2016-06-14 00:57:18 +00:00

media

Merge "docs: InfoPros, Project 02, Batch 03" into mnc-mr-docs am: d00f005 am: 94e5237

2016-04-27 03:11:53 +00:00

processes

…

providers

Merge "Docs: Fixed an invalid initialization of ExampleProvider member in Content URI patterns docs sample" into mnc-io-docs am: 709f0df0d8

2016-05-28 01:24:52 +00:00

renderscript

resolve merge conflicts of ed6625d to stage-aosp-master

2016-07-21 11:43:15 -07:00

resources

Update links for all files under sdk/ that moved to studio/ am: 89d11705a1 am: d10e0132a1

2016-05-15 03:11:46 +00:00

search

Merge "docs: InfoPros, Project 02, Batch 03" into mnc-mr-docs am: d00f005 am: 94e5237

2016-04-27 03:11:53 +00:00

security

docs: removing duplicate security config doc

2016-06-15 10:50:42 -07:00

sensors

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

text

…

ui

Merge "docs: InfoPros, Project 02, Batch 03" into mnc-mr-docs am: d00f005 am: 94e5237

2016-04-27 03:11:53 +00:00