David Friedman 704ebab343 resolved conflicts for merge of 6248cdd5 to master ...

Change-Id: I4f7f69c28c90ff4fb8e2db9468d8024162f62c7b

2015-02-23 14:40:48 -08:00

..

adk

…

building

am 3961def5: am f8afd564: am c6326f44: am 05defb99: Merge "docs: plugin for gradle typo" into lmp-docs automerge: 5421eee

2015-01-28 04:33:59 +00:00

debugging

am 93cd3929: am c905da57: am 5af2270b: am cd9c0cab: am 708959b5: am 755c5d88: am 56375d90: docs: lint inspection updates

2015-02-18 23:50:14 +00:00

devices

docs: studio emulator platform update

2015-01-21 13:52:56 -08:00

extras

docs:setting up hardware devices [CP]

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

help

docs: lint inspection updates

2015-02-18 14:17:21 -08:00

projects

docs: site mipmap folder updates

2015-02-17 12:34:35 -08:00

publishing

doc: SDK install page fix and link fixes

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

revisions

docs: android plugin revisions page v2

2015-02-20 09:52:13 -08:00

sdk

docs: sdk revision 24.0.2

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

studio

resolved conflicts for merge of 6248cdd5 to master

2015-02-23 14:40:48 -08:00

support-library

docs: remove + annotations in version references

2015-01-22 17:48:43 -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

am 2d43b730: am d2856643: am 4abf87f1: Merge "docs: android plugin for gradle revisions page" into lmp-docs automerge: cb73fb9 automerge: 4826bed

2015-02-17 23:43:03 +00:00

workflow.jd

…