Rich Slogar 21d940c3cf resolved conflicts for merge of 20e7ab86 to master ...

Change-Id: I346419455a1a97c3eddb639188bcd81593887e97

2015-01-16 11:56:55 -08:00

..

adk

…

building

am 633db0ee: am c4429f1f: am 001f6f54: am 66fefd0c: am a9a36ab2: Merge "docs: plugin link name update" into lmp-docs

2015-01-06 22:39:58 +00:00

debugging

Remove references to apache-http from various documents.

2014-12-12 14:55:18 +00:00

devices

docs: studio device emulator updates

2014-12-15 14:39:25 -08:00

extras

docs:setting up hardware devices [CP]

2014-12-06 09:15:04 +00:00

help

am a5142ca4: am 85787187: am b8e29d01: am 740436b6: Merge "docs: help-adt link updates" into lmp-docs automerge: 9381301

2014-12-17 17:49:47 +00:00

projects

docs: project file and toc updates

2014-12-18 13:58:06 -08:00

publishing

doc: SDK install page fix and link fixes

2014-12-07 22:58:57 -08:00

revisions

docs: studio 1.0.1 revision update

2014-12-12 21:19:02 -08:00

sdk

docs: sdk revision 24.0.2

2014-12-17 16:40:53 -08:00

studio

resolved conflicts for merge of 20e7ab86 to master

2015-01-16 11:56:55 -08:00

support-library

docs: plugin reference update

2014-12-16 13:21:56 -08:00

testing

am a27afde3: Merge "Fix typo in activity_testing.jd" into lmp-mr1-dev

2014-10-31 18:45:18 +00:00

workflow

Merge "docs: studio workflow links" into lmp-docs

2014-12-19 05:22:50 +00:00

device.jd

docs:setting up hardware devices [CP]

2014-12-06 09:15:04 +00:00

tools_toc.cs

resolved conflicts for merge of 175ef812 to master

2015-01-06 11:50:08 -08:00

workflow.jd

…