947 Commits

Author SHA1 Message Date
Joe Fernandez
c79d5e29de am f9ea93cd: am 80287e76: Merge "docs: studio tools help monkey update" into lmp-docs
automerge: e479dc2

* commit 'e479dc219ff4d289105e32264c1fa66187aa5555':
  docs: studio tools help monkey update
2014-12-17 17:40:58 +00:00
Joe Fernandez
85787187fc am b8e29d01: am 740436b6: Merge "docs: help-adt link updates" into lmp-docs
automerge: 9381301

* commit '93813012c0be63a4cbcdf9e076323fd4afd6dfb7':
  docs: help-adt link updates
2014-12-17 17:39:45 +00:00
Joe Fernandez
df916a89fe Merge "docs: studio revision 21 update" into lmp-docs 2014-12-17 02:21:50 +00:00
Joe Fernandez
80287e768f Merge "docs: studio tools help monkey update" into lmp-docs 2014-12-17 02:20:15 +00:00
Joe Fernandez
740436b676 Merge "docs: help-adt link updates" into lmp-docs 2014-12-17 01:44:22 +00:00
Rich Slogar
7749dede45 docs: plugin reference update
Change-Id: Icb7881b990ce49f04d2c09d8b9ebcdb4c3db318e
2014-12-16 13:21:56 -08:00
Narayan Kamath
d02a898528 resolved conflicts for merge of f44fdaed to master
Change-Id: I324b252123b7fc4a38aad9be4b986cb564a17b14
2014-12-16 10:57:05 +00:00
Joe Fernandez
ac45fe9fb5 am 9a0be7d3: am 519fbf3a: am 4234fca6: am 044f3947: Merge "docs: uiautomator blog link removal" into lmp-docs automerge: d799f75
automerge: 11341c4

* commit '11341c4d32c76e32a2df22a166085e6ede2fcdc7':
  docs: uiautomator blog link removal
2014-12-16 02:38:19 +00:00
Joe Fernandez
7e5e1ccdad am e33b63fe: am 9a05dee5: am e70cb874: am c59d1d78: Merge "docs: studio basics typo" into lmp-docs automerge: 72268ad
automerge: d6bba15

* commit 'd6bba15c032270f9545b20cbf6fa8792559ce1fb':
  docs: studio basics typo
2014-12-16 02:37:07 +00:00
Rich Slogar
f44fdaedbf am ccaf3552: am 57911088: am 895d1694: am 6b8756c3: docs: studio 1.0.1 revision update automerge: b2a9bd5
* commit 'ccaf3552e62bb7ef2373bd4c282d275a209b7d91':
  docs: studio 1.0.1 revision update
2014-12-16 02:31:29 +00:00
Joe Fernandez
11341c4d32 am 9a0be7d3: am 519fbf3a: am 4234fca6: am 044f3947: Merge "docs: uiautomator blog link removal" into lmp-docs automerge: d799f75
* commit '9a0be7d31da7c340fd1f5b57c9e1527726697fcc':
  docs: uiautomator blog link removal
2014-12-16 02:31:17 +00:00
Joe Fernandez
d6bba15c03 am e33b63fe: am 9a05dee5: am e70cb874: am c59d1d78: Merge "docs: studio basics typo" into lmp-docs automerge: 72268ad
* commit 'e33b63feecf6dc76db716c8064f5a21c751b81d7':
  docs: studio basics typo
2014-12-16 02:23:24 +00:00
Rich Slogar
579110887d am 895d1694: am 6b8756c3: docs: studio 1.0.1 revision update
automerge: b2a9bd5

* commit 'b2a9bd5e9b1984b8aeda17b0c1477e9190fc171e':
  docs: studio 1.0.1 revision update
2014-12-16 01:36:40 +00:00
Joe Fernandez
519fbf3ae7 am 4234fca6: am 044f3947: Merge "docs: uiautomator blog link removal" into lmp-docs
automerge: d799f75

* commit 'd799f75c6b3adb088372f73967aee6362407e59b':
  docs: uiautomator blog link removal
2014-12-16 01:33:56 +00:00
Joe Fernandez
9a05dee5ec am e70cb874: am c59d1d78: Merge "docs: studio basics typo" into lmp-docs
automerge: 72268ad

* commit '72268ad3d4ecdeaee47ad8de0ec372bb834255c7':
  docs: studio basics typo
2014-12-16 01:32:49 +00:00
Rich Slogar
88b276970e docs: studio device emulator updates
Change-Id: If11f5c5cd1c3b990980d83980cdb324700289a6f

 On branch studio-device-emulator-updates
	modified:   docs/html/tools/devices/emulator.jd
2014-12-15 14:39:25 -08:00
Rich Slogar
c819d3df86 docs: studio revision 21 update
Change-Id: I61a6fa657aae08760a73816d5ad5536957a3be20
2014-12-15 10:46:18 -08:00
Rich Slogar
6b8756c397 docs: studio 1.0.1 revision update
Change-Id: If9ef9ba986ae02463bec8040924a06ab0ccc8124
2014-12-12 21:19:02 -08:00
Joe Fernandez
044f3947bc Merge "docs: uiautomator blog link removal" into lmp-docs 2014-12-13 00:20:35 +00:00
Joe Fernandez
c59d1d780b Merge "docs: studio basics typo" into lmp-docs 2014-12-13 00:03:10 +00:00
Rich Slogar
7789f4dbee docs: studio basics typo
Change-Id: I3e20deb2abc8513266cc2182d9be1ae809bbeae0
2014-12-12 15:56:46 -08:00
Rich Slogar
50ff944c02 docs: help-adt link updates
Change-Id: I60fdea090d330a90ebf12b954fa312dbd49cec29
2014-12-12 09:59:02 -08:00
Narayan Kamath
93bb5419aa Merge "Remove references to apache-http from various documents." 2014-12-12 14:56:44 +00:00
Narayan Kamath
56eb989791 Remove references to apache-http from various documents.
Most of them are pointless links to a "text/plain" constant which are
far clearer when inlined with the relevant text.

Change-Id: Iaed51b4548cb2836741106dc19c9cf500c205d32
2014-12-12 14:55:18 +00:00
Joe Fernandez
80cfbedbfd am 6ea9db4b: am 81779694: am c9014b6d: am ea500a3a: am 0aa23445: Merge "docs: studio basics haxm updates" into lmp-docs automerge: a878256
* commit '6ea9db4b6434b9f2c1059e7c4a050ea4245a7342':
  docs: studio basics haxm updates
2014-12-12 04:25:59 +00:00
Joe Fernandez
e5624ae02b am 11fc651a: am 07877955: am 5c518b7f: am b32987ec: am c3daed96: Merge "docs: platform updates for api 21" into lmp-docs automerge: cc08e61
* commit '11fc651aefbcdebc646f347e4981204d3ef7b0a7':
  docs: platform updates for api 21
2014-12-12 04:21:22 +00:00
Joe Fernandez
3e42bb70e4 am 4cb6d10d: am e3bac3bc: am b64545c8: am 378c71a3: am 235e4be4: Merge "docs: sdk tools 24.0.1 revisions" into lmp-docs automerge: 11bccb1
* commit '4cb6d10d5e7d7b21a1d9ee2d0b69c7a34f86503c':
  docs: sdk tools 24.0.1 revisions
2014-12-12 04:21:17 +00:00
Joe Fernandez
6ea9db4b64 am 81779694: am c9014b6d: am ea500a3a: am 0aa23445: Merge "docs: studio basics haxm updates" into lmp-docs
automerge: a878256

* commit 'a878256b59e1766ce918257dbfe343b0d3d0ec2d':
  docs: studio basics haxm updates
2014-12-12 04:19:03 +00:00
Joe Fernandez
11fc651aef am 07877955: am 5c518b7f: am b32987ec: am c3daed96: Merge "docs: platform updates for api 21" into lmp-docs
automerge: cc08e61

* commit 'cc08e619d6a946b58b2aae857e3190b5996c07b8':
  docs: platform updates for api 21
2014-12-12 04:14:43 +00:00
Joe Fernandez
4cb6d10d5e am e3bac3bc: am b64545c8: am 378c71a3: am 235e4be4: Merge "docs: sdk tools 24.0.1 revisions" into lmp-docs
automerge: 11bccb1

* commit '11bccb1ebe457bc3cca582320d13a459920425d9':
  docs: sdk tools 24.0.1 revisions
2014-12-12 04:13:20 +00:00
Rich Slogar
49d4fdc0c3 docs: uiautomator blog link removal
Change-Id: I4e5afc42798c4f313d6bdefd5e884fd39c48f469
2014-12-11 16:17:36 -08:00
Rich Slogar
76a49a818d docs: studio tools help monkey update
Change-Id: Ib916e60dbf6caffc97ac4414f661276339d86888
2014-12-11 15:09:42 -08:00
Rich Slogar
385f475472 docs: studio workflow links
Change-Id: I1b06d989c282ce85afa94cd5b4522d895905c3b0
2014-12-11 13:49:07 -08:00
Joe Fernandez
817796940b am c9014b6d: am ea500a3a: am 0aa23445: Merge "docs: studio basics haxm updates" into lmp-docs
* commit 'c9014b6d59cae3602027a5ea373d436a7e78b71c':
  docs: studio basics haxm updates
2014-12-11 20:55:53 +00:00
Joe Fernandez
07877955be am 5c518b7f: am b32987ec: am c3daed96: Merge "docs: platform updates for api 21" into lmp-docs
* commit '5c518b7f01345a414cd260db7762bdb0aa73b55b':
  docs: platform updates for api 21
2014-12-11 20:55:35 +00:00
Joe Fernandez
e3bac3bc8f am b64545c8: am 378c71a3: am 235e4be4: Merge "docs: sdk tools 24.0.1 revisions" into lmp-docs
* commit 'b64545c83a526d17ccbce2d110a06f3789dd4ad8':
  docs: sdk tools 24.0.1 revisions
2014-12-11 20:55:29 +00:00
Joe Fernandez
0aa2344577 Merge "docs: studio basics haxm updates" into lmp-docs 2014-12-11 19:43:18 +00:00
Rich Slogar
d282ba778b docs: studio basics haxm updates
Change-Id: I2c3ef0dae3a091be27f1cfef13fe385f97781492
2014-12-11 10:03:19 -08:00
Joe Fernandez
c3daed967d Merge "docs: platform updates for api 21" into lmp-docs 2014-12-11 00:31:54 +00:00
Joe Fernandez
235e4be4c9 Merge "docs: sdk tools 24.0.1 revisions" into lmp-docs 2014-12-11 00:27:02 +00:00
Joe Fernandez
4c7ec3d469 am e4e1687d: am 5a64a475: am 9727d191: am 534ae165: am 3454091d: Merge "docs:studio basic links" into lmp-docs automerge: 4ded0a1
* commit 'e4e1687d73870a3ea05a26fb3a3ec598b42f053d':
  docs:studio basic links
2014-12-10 22:00:11 +00:00
smain@google.com
2c3c4b168b am 835ad716: am 5a267e72: am 5b16e21b: am 6554bb45: am 1a2308bb: Merge "misc updates related to Android Studio. clarify a few doc titles for improved search results clarity. update "get started" page link to Android Studio, add First App link, and remove some biased l
* commit '835ad71635638f1154a887464758fe81457da327':
  misc updates related to Android Studio. clarify a few doc titles for improved search results clarity. update "get started" page link to Android Studio, add First App link, and remove some biased language.
2014-12-10 21:58:06 +00:00
Joe Fernandez
f9d2cd9931 am 844af56b: am efab8b6f: am bdd6aabd: am d49977d9: Merge "docs: update debug menu for debugging-studio" into lmp-docs
automerge: 15cfa4f

* commit '15cfa4f3012f9bdb39b0c9c0d339b3d76694abfa':
  docs: update debug menu for debugging-studio
2014-12-10 20:04:31 +00:00
Joe Fernandez
e4e1687d73 am 5a64a475: am 9727d191: am 534ae165: am 3454091d: Merge "docs:studio basic links" into lmp-docs
automerge: 4ded0a1

* commit '4ded0a166f96da7bcb377c0573ba373b77fe596e':
  docs:studio basic links
2014-12-10 19:56:05 +00:00
Joe Fernandez
844af56b85 am efab8b6f: am bdd6aabd: am d49977d9: Merge "docs: update debug menu for debugging-studio" into lmp-docs
* commit 'efab8b6fd50e2e4ad3adb03c4bca2bc531ae5d42':
  docs: update debug menu for debugging-studio
2014-12-10 19:54:51 +00:00
Joe Fernandez
5a64a47580 am 9727d191: am 534ae165: am 3454091d: Merge "docs:studio basic links" into lmp-docs
* commit '9727d1910052e600ebcf417c9fe55436ecf2c9de':
  docs:studio basic links
2014-12-10 19:46:37 +00:00
Joe Fernandez
d49977d967 Merge "docs: update debug menu for debugging-studio" into lmp-docs 2014-12-10 19:31:12 +00:00
Rich Slogar
7deca3c93f docs: sdk tools 24.0.1 revisions
Change-Id: I872aaba5844fe7642874147b158c8119d111162d
2014-12-10 11:27:59 -08:00
Joe Fernandez
3454091dad Merge "docs:studio basic links" into lmp-docs 2014-12-10 19:23:16 +00:00
Rich Slogar
bea1510573 docs: update debug menu for debugging-studio
Change-Id: I04c71104b1ac9c0e4413c518ccd41ba3e6a90f8f
2014-12-10 11:14:15 -08:00