Trevor Johns
682c24e228
Resolve merge conflicts of a5060ee to nyc-dev
...
This undoes the automerger skip which occured in
commit e740c84dc3
2016-04-19 02:03:59 -07:00
Adarsh Fernando
0d75c64032
docs: removed duplicate "Synctrace" definition.
...
bug: 25902983
Change-Id: I3bd4f8566a616597db4545f414b557551d01122d
2015-12-11 09:04:25 -08:00
Neil Fuller
71fbb81b14
Fix @code escapes
...
The body of {@code} must not be HTML escaped. This is one of
several changes that fix the source in conjunction with a
doclava fix.
Bug: 25757239
Change-Id: Ib38a0fa2dd2a3d68e467f78a812071e763d7e881
2015-12-02 14:24:11 +00:00
Rich Slogar
8c08075b4f
am 93151529: am 3fa76699: am f71e3b2b: am 9dbc35d1: am 258b56ec: am 9f37bd8a: am 0238bf24: docs: New auto Desktop Head Unit (DHU) docs
...
* commit '9315152977ccfe4694a208bfa23dfc84aca9d758':
docs: New auto Desktop Head Unit (DHU) docs
2015-08-27 05:17:45 +00:00
Jaewan Kim
e9bcad0055
Merge "Fix inconsistency between monkey documentation and code"
2015-08-27 02:40:00 +00:00
Rich Slogar
0238bf2480
docs: New auto Desktop Head Unit (DHU) docs
...
See comment on patch set 9 for doc stage location.
bug:22069078
bug:23341937
Change-Id: I21565b82199394622ce4113b42174277c0248998
2015-08-26 16:14:34 -07:00
Jaewan Kim
895d25efce
Fix inconsistency between monkey documentation and code
...
This has been an issue since Cupcake.
Fixing documentation looks better not to affect existing tests.
Bug: 22495550
Change-Id: I30bebfeb2e000b3155afa3f9cc55f5bad0a052bf
2015-08-20 07:28:59 +00:00
David Friedman
ed54f60ae4
Merge "Docs: Updating, clarifying Debug-over-WiFi instructions. Bug: 21371836" into mnc-preview-docs
2015-08-19 22:21:41 +00:00
David Friedman
aee78937e4
Docs: Updating, clarifying Debug-over-WiFi instructions.
...
Bug: 21371836
Change-Id: Ieef63c416c85f778e4b00ef08b434040709c2493
2015-08-19 15:19:18 -07:00
Rich Sloager
322de02a10
Merge "docs: studio 1.3 hprof viewer" into mnc-preview-docs
2015-07-30 18:11:23 +00:00
Rich Sloager
054711b604
Merge "docs: studio 1.3 sdk manager updates" into mnc-preview-docs
2015-07-30 18:08:37 +00:00
Rich Slogar
f0235423ae
docs: studio 1.3 sdk manager updates
...
Change-Id: I4657b3d2c65beede286986fd9405234d7633c765
2015-07-24 10:57:51 -07:00
Rich Slogar
f6d03e527c
docs: studio 1.3 hprof viewer
...
Change-Id: I075a5f8a2ac835c31ea3cc1f50f8e013e1997501
2015-07-21 11:43:19 -07:00
David Friedman
e0f0fabbb1
am ccb8a9af: am b510225e: Merge "docs: replacing command line tool instructions with Studio and Monitor steps" into lmp-docs
...
* commit 'ccb8a9af1cf4c392b05ec7654d2a7213c8ef4019':
docs: replacing command line tool instructions with Studio and Monitor steps
2015-07-11 03:06:00 +00:00
David Friedman
ccb8a9af1c
am b510225e: Merge "docs: replacing command line tool instructions with Studio and Monitor steps" into lmp-docs
...
* commit 'b510225e44742d488beb7dcf0248c9ba9b4010c9':
docs: replacing command line tool instructions with Studio and Monitor steps
2015-07-11 02:53:54 +00:00
David Friedman
b510225e44
Merge "docs: replacing command line tool instructions with Studio and Monitor steps" into lmp-docs
2015-07-11 02:41:13 +00:00
Rich Slogar
fd3b64b8aa
am b0afc540: docs: Eclipse ADT end-of-life note
...
* commit 'b0afc540ebee64ded367ce34ae8f61cb8c2478e7':
docs: Eclipse ADT end-of-life note
2015-06-26 06:53:20 +00:00
Rich Slogar
b0afc540eb
docs: Eclipse ADT end-of-life note
...
Change-Id: I5fe9de7145104191d330259c7e16ea14cc4a651e
2015-06-25 23:40:32 -07:00
Rich Slogar
2c35e92ede
docs: replacing command line tool instructions with Studio and Monitor steps
...
b.android 176255
Change-Id: I625c5dcb3437f6412fccc1a6c536a93c8646fe22
2015-06-24 14:01:49 -07:00
Luan Nguyen
c5a480d112
am fdad629f: am 6859a9f0: Merge "docs: Pare down the adb guide and remove sections that are duplicated in the tools list." into lmp-docs
...
* commit 'fdad629fc089783fa0b3caad62ba99a9083f8645':
docs: Pare down the adb guide and remove sections that are duplicated in the tools list.
2015-06-24 15:05:13 +00:00
Luan Nguyen
fdad629fc0
am 6859a9f0: Merge "docs: Pare down the adb guide and remove sections that are duplicated in the tools list." into lmp-docs
...
* commit '6859a9f09049d1dc760b98a6cbb278b591de63a6':
docs: Pare down the adb guide and remove sections that are duplicated in the tools list.
2015-06-24 14:51:30 +00:00
Luan Nguyen
6859a9f090
Merge "docs: Pare down the adb guide and remove sections that are duplicated in the tools list." into lmp-docs
2015-06-24 14:43:31 +00:00
Luan Nguyen
1afb2d5335
docs: Pare down the adb guide and remove sections that are duplicated
...
in the tools list.
bug: 12879186
Change-Id: Ic2d17ef29eac15a9ffc40e05b056dc17d71069e8
2015-06-22 17:00:02 -07:00
Chris Craik
17498cd944
Rework systrace analysis documentation
...
Also update some of the out-of-date aspects of the systrace help page.
Change-Id: I869f6d481ecc2835ea8713bb46f6e5d550abea98
2015-06-01 17:11:46 -07:00
Rich Slogar
6b1b71c963
docs: hierarchyviewer updates
...
b/19955159
Change-Id: I77da54048765eeb768ec59a0ce0cbe40d0ba9715
(cherry picked from commit f9f81b49d0
2015-04-19 22:37:34 +00:00
Rich Slogar
efe861a4a7
Merge "docs: hierarchyviewer updates" into lmp-docs
2015-04-17 16:52:45 +00:00
Brian Carlstrom
40955edf9d
am 14a982aa: Merge "Document hprof-conv -z"
...
* commit '14a982aa7a38fa89c916c252996632d401b1d043':
Document hprof-conv -z
2015-04-16 17:31:34 +00:00
Brian Carlstrom
d7931acf4a
Document hprof-conv -z
...
Bug: 18473132
Change-Id: I3c0fcc2c15d4c590ed852f41aa4fd2a2531a6db8
2015-04-16 10:06:58 -07:00
Rich Slogar
f9f81b49d0
docs: hierarchyviewer updates
...
b/19955159
Change-Id: I77da54048765eeb768ec59a0ce0cbe40d0ba9715
2015-04-15 15:48:35 -07:00
Rich Slogar
bdc2010920
Merge "docs: systrace update" into lmp-docs
2015-04-13 18:14:06 +00:00
Rich Slogar
a7ade2f7f0
Merge "docs: remove adb install option" into lmp-docs
2015-04-13 18:13:10 +00:00
Rich Slogar
19f75fd71e
docs: systrace update
...
Change-Id: I693f6b3eef32a412dd1764d39706dcebef9e000c
2015-03-31 16:14:51 -07:00
Rich Slogar
d58858427e
Merge "docs: proguard help update" into lmp-docs
2015-03-19 19:04:05 +00:00
Rich Slogar
f062b94cc2
docs: proguard help update
...
b/19383794
b/19417644
Change-Id: I454015fb85601dbd31d3cb364eaa6d0adee0c764
2015-03-19 10:55:27 -07:00
Rich Slogar
50c7c5a228
docs: remove adb install option
...
b/19731712
Change-Id: Ie000ce7cedde9599488ba00dcf28d0e31b0cdf87
2015-03-16 10:04:43 -07:00
Quddus Chong
489218c3ed
docs: Added overview page and Javadocs for the Android Testing Support Library.
...
Change-Id: I645d3a302ce0d1d4cd389c6a58709a11a0426aed
2015-03-11 16:08:24 -07:00
Rich Slogar
0a504745b4
Merge "docs: 9patch tool update" into lmp-docs
2015-02-26 18:02:43 +00:00
Rich Slogar
6de010f600
docs: remove exploring sdk link
...
b.android 153523
Change-Id: Iaf4de80196d10d686d5a4bde5ffa4169df2810cd
2015-02-23 11:37:36 -08:00
Rich Slogar
56375d9066
docs: lint inspection updates
...
Change-Id: I870533a8b22b54b848b9245387ca40d79e49295f
2015-02-18 14:17:21 -08:00
Rich Slogar
4bdb437bc6
docs: 9patch tool update
...
b/18019306
Change-Id: I8cd84afe47d0d3ac344f0581075c015049777e27
2015-02-18 10:36:05 -08:00
Rich Slogar
be8e62388c
docs: note to install linux packages
...
b/2845850
b.android 98328
Change-Id: I23224f24cb0b42ec4ffb3829e2246628da140f8c
2015-02-02 16:08:03 -08:00
Joe Fernandez
09d6ed50a7
am a5142ca4: am 85787187: am b8e29d01: am 740436b6: Merge "docs: help-adt link updates" into lmp-docs automerge: 9381301
...
* commit 'a5142ca4d488fa216342213784df61b2e090cacb':
docs: help-adt link updates
2014-12-17 17:49:47 +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
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
Rich Slogar
50ff944c02
docs: help-adt link updates
...
Change-Id: I60fdea090d330a90ebf12b954fa312dbd49cec29
2014-12-12 09:59:02 -08: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
smain@google.com
b1d4125554
am 92b6011d: am 9ecc18e2: am 4267450e: am 780a2231: am 2023bec7: revise ADT migration message b/18668828 and fix broken link
...
* commit '92b6011d950a8dee26b43eb107313e98a285009c':
revise ADT migration message b/18668828 and fix broken link
2014-12-09 22:19:09 +00:00
smain@google.com
bd5098e6b4
am 7ee7d325: am 664ab723: am aba6a432: am 02cd3a40: am 6ae492e6: changes to deprecate eclipse docs and update migration guide
...
* commit '7ee7d3252cd1becd94de386ae02ad4229fa08f04':
changes to deprecate eclipse docs and update migration guide
2014-12-09 22:18:39 +00:00
