Andreas Gampe b3fd7e1be6 resolved conflicts for merge of d93f4c8b to master ...

Change-Id: Iec5cabbeb128a4696a8a670afbf2f4cb9ebdb2de

2015-03-12 22:51:01 -07:00

..

adk

Fix USB typos

2015-03-06 16:15:15 +00:00

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

…

help

docs: Added overview page and Javadocs for the Android Testing Support Library.

2015-03-11 16:08:24 -07:00

projects

docs: site mipmap folder updates

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

publishing

…

revisions

Merge "docs: build tools revision 22.0.0:" into lmp-mr1-dev

2015-03-09 23:42:48 +00:00

sdk

Merge "docs: eclipse revisions update" into lmp-docs

2015-03-10 19:15:10 +00:00

studio

resolved conflicts for merge of 6248cdd5 to master

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

support-library

docs: support library updates for sdk 22

2015-03-02 22:07:07 -08:00

testing

am 0d258a93: am 737d3cc0: am 77eb85e1: am c706a980: am a236a49e: am 47426f1c: Merge "docs: Added overview page and Javadocs for the Android Testing Support Library." into lmp-docs

2015-03-11 23:57:40 +00:00

testing-support-library

docs: Added overview page and Javadocs for the Android Testing Support Library.

2015-03-11 16:08:24 -07:00

workflow

…

device.jd

…

tools_toc.cs

resolved conflicts for merge of d93f4c8b to master

2015-03-12 22:51:01 -07:00

workflow.jd

…