Kevin Hufnagle 397ae7a2e6 resolve merge conflicts of 7f7eec3 to nyc-dev ...

Change-Id: I35b5b7103b89e0e12e21e809a3d3952738c9a668

2016-05-26 14:57:15 -07:00

..

admin

docs: work minisite

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

appwidgets

docs: Removed references to lockscreen widgets, added note to Android 5.0

2015-07-13 16:19:08 -07:00

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

resolve merge conflicts of 7f7eec3 to nyc-dev

2016-05-26 14:57:15 -07: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

Resolve merge conflicts of a5060ee to nyc-dev

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

renderscript

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -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

Merge "docs: Noted that custom permissions must be unique per-device" into mnc-mr-docs am: 9be023f077 am: 76f95f5571

2016-05-12 18:48:50 +00: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