63 Commits

Author SHA1 Message Date
Tenghui Zhu
c9ecc98594 Merge "Add some bookmarks to plugin-for-gradle page" into mnc-dev 2015-08-18 23:13:12 +00:00
David Friedman
eaabddf121 Docs: Fixing files that didn't merge properly from mnc-preview-docs
Change-Id: If1a97d8da5a8e7f65293bc34e1a1646f06a48043
2015-08-17 18:45:36 -07:00
Rich Sloager
0ac81a6e14 am fd8da61a: am f0cd0441: Merge "docs: studio 1.3 manifest merger update" into mnc-preview-docs
* commit 'fd8da61afdc883550a25f62003c8beff3c91b9e3':
  docs: studio 1.3 manifest merger update
2015-08-17 15:38:09 +00:00
Rich Sloager
7026df3b94 am 5f8d3728: am b8987585: Merge "docs: studio 1.3 revisions - studio" into mnc-preview-docs
* commit '5f8d3728480d74f997f513049a9d8e58557e81f3':
  docs: studio 1.3 revisions - studio
2015-08-17 15:37:50 +00:00
ztenghui
9a2ab4c32a Add some bookmarks to plugin-for-gradle page
b/23192453

Change-Id: I8addb8440697c1ab2e9a58c7e33fa1fc240c050f
2015-08-13 15:32:08 -07:00
Rich Sloager
f0cd0441ce Merge "docs: studio 1.3 manifest merger update" into mnc-preview-docs 2015-07-30 18:14:12 +00:00
Rich Slogar
1d6389a98f docs: studio 1.3 manifest merger update
b/22641828

Change-Id: I383fda4773df0ec8792f040d7af960d288afb9ca
2015-07-24 11:03:18 -07:00
Rich Slogar
0b1c574bd4 docs: studio 1.3 revisions - studio
Change-Id: I0d52bd8904ad1bb444c6f4775debb3846e30b670
2015-07-23 10:32:27 -07:00
Rich Slogar
1b0120f901 Merge commit '88c0af88' into mnc-dev...
Change-Id: Ib5a797e9a54ab1d447d84a57a209b32c4839b8c3
2015-07-01 17:01:00 -07:00
Rich Slogar
8371632b16 docs: Studio 1.3 new install and feature sections
Change-Id: I1bf6d1fa60b01b404a01cc3b5f45753a764d6f31
2015-06-30 15:43:54 -07:00
Rich Slogar
cea2b1c725 am 76e42bdd: am 3686e043: am 268a7c19: am fc7e84b3: Merge "docs: manifest merger updates" into lmp-docs
* commit '76e42bdd05f6defa283f9df12966928328680445':
  docs: manifest merger updates
2015-06-26 23:06:59 +00:00
Rich Slogar
52d82d7ea9 am 32279219: am fd3b64b8: am b0afc540: docs: Eclipse ADT end-of-life note
* commit '3227921922b3750e04e309b7cacd55d5f0b5b77d':
  docs: Eclipse ADT end-of-life note
2015-06-26 22:58:20 +00:00
Rich Slogar
268a7c190c am fc7e84b3: Merge "docs: manifest merger updates" into lmp-docs
* commit 'fc7e84b36b77ac95e61bd1736eebdc307ba6e09e':
  docs: manifest merger updates
2015-06-26 22:11:44 +00:00
Rich Slogar
fc7e84b36b Merge "docs: manifest merger updates" into lmp-docs 2015-06-26 21:56:25 +00:00
Rich Slogar
66502afb0f docs: manifest merger updates
Change-Id: I0a1c311ba08077b15ee1823146773b7d07162dd4
2015-06-26 12:45:24 -07:00
Rich Slogar
b0afc540eb docs: Eclipse ADT end-of-life note
Change-Id: I5fe9de7145104191d330259c7e16ea14cc4a651e
2015-06-25 23:40:32 -07:00
Joe Fernandez
a309f4a041 am a8b518d7: am 041e01bb: am 003f8567: Merge "updates: build-cmdline-update" into lmp-mr1-ub-docs
* commit 'a8b518d7c2ca006ad52d5900ebb3ca831490d373':
  updates: build-cmdline-update
2015-06-19 21:08:08 +00:00
Joe Fernandez
003f8567de Merge "updates: build-cmdline-update" into lmp-mr1-ub-docs 2015-06-19 20:32:34 +00:00
Rich Slogar
5c19a842bb updates: build-cmdline-update
b.android/175610

Change-Id: I712ded3e024685b35ae98f8517958db330890c18
2015-06-09 10:16:51 -07:00
Rich Slogar
bfc14e3eb2 am 54f2ca6e: am 348d105e: am 4e793fba: Merge "docs: build-cmd-line-updates" into lmp-mr1-ub-docs
* commit '54f2ca6ed4c8c224da932f2f63fdf2fbe03eea64':
  docs: build-cmd-line-updates
2015-05-18 21:22:19 +00:00
Rich Slogar
4af26cbfa4 docs: build-cmd-line-updates
b/20944423

Change-Id: I0c384650664c51b5b7879bb58deca2be8f1ceff9
2015-05-13 17:34:19 -07:00
Rich Slogar
f1ca577728 am 34e0f640: am 84a67c7d: am 1b5f692d: am 9b4d57e1: Merge "docs: gradle multidex update" into lmp-docs
* commit '34e0f6401e66df33ec71df7f76196bbe0eca3183':
  docs: gradle multidex update
2015-05-06 01:24:46 +00:00
Rich Slogar
9b4d57e1dc Merge "docs: gradle multidex update" into lmp-docs 2015-05-05 23:42:23 +00:00
Rich Slogar
0820394f7e resolved conflicts for merge of edf44562 to mnc-dev
Change-Id: I2df8255d12feed8c17b9c9f009453701cd412676
2015-04-30 14:20:12 -07:00
Rich Slogar
2a3aa2d343 docs: studio 1.2 updates
Change-Id: I893af7af0f686d0eeab11f881256c0cf26eb4605
2015-04-29 19:47:25 -07:00
Rich Slogar
7a42107687 docs: gradle multidex update
b.andriod 103259
b.android 165146

Change-Id: If5107aa419b9eb097249141460d0dd8673dce240
2015-04-21 14:44:12 -07:00
Rich Slogar
3e1cfe106a am fea8ddd4: am a9315dc1: am c1002dfc: am 71a616e0: am 203a4739: am 1fcc6bd8: Merge "docs: studio remove gradle tasks dialog" into lmp-docs
* commit 'fea8ddd4c7a79cc68a96901f86cfa527bbd44fd0':
  docs: studio remove gradle tasks dialog
2015-04-17 18:01:05 +00:00
Rich Slogar
caa15d49f9 docs: studio remove gradle tasks dialog
Change-Id: If7517f49307a1e27b1d4053bd49ccdb07ffb758e
2015-04-15 10:30:18 -07:00
Rich Slogar
c259ba0390 am a29a34b0: am efa9bfac: am e3d92a20: am 983dd1a9: am b569ec3c: am d76aa14c: am d5885842: Merge "docs: proguard help update" into lmp-docs
* commit 'a29a34b0540a895c75f6d516ec4cc9860be6253d':
  docs: proguard help update
2015-03-19 20:17:37 +00: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
f9d525912c am 93d44992: am 1a27a3fb: am 46005888: am 0146922a: am 633f4829: am 7256fb4f: am a6b0ddb7: Merge "docs: build image updates" into lmp-docs
* commit '93d44992ecf41b8169391005f7d3d219785eef90':
  docs: build image updates
2015-03-13 06:33:26 +00:00
Rich Slogar
a6b0ddb7f1 Merge "docs: build image updates" into lmp-docs 2015-03-12 00:34:10 +00:00
Rich Slogar
2868e7260a docs: build image updates
Change-Id: I9bc252b2f3a43085b69b1177242cc8b1fc0e0662
2015-02-25 15:39:07 -08:00
Joe Fernandez
47185e8c71 am 3961def5: am f8afd564: am c6326f44: am 05defb99: Merge "docs: plugin for gradle typo" into lmp-docs automerge: 5421eee
automerge: 617af27

* commit '617af27167d4d943043761414709e115e74c55fa':
  docs: plugin for gradle typo
2015-01-28 04:33:59 +00:00
Rich Slogar
639248789c docs: plugin for gradle typo
b/19106103

Change-Id: I3db503ccd5a93ee0a3bdf6dfb8c76f7391a5e75e
2015-01-23 09:57:37 -08:00
Rich Slogar
173f8b4afb am cbe297d4: am e1a7b400: am a84faf0f: am 3505303a: am 3b7dbd66: Merge "docs: build link update" into lmp-docs
* commit 'cbe297d4d0ce31928670ff63b4f8dfb8b9fb7fc0':
  docs: build link update
2015-01-16 20:06:23 +00:00
Rich Slogar
edb956d6a6 am 7d8a43f2: am cd0bdc35: am ab8a5a0e: am f1feda36: am 485b9566: Merge "docs: Plugin reference update" into lmp-docs
* commit '7d8a43f233a588a592a8ba97982d8720ff67f28a':
  docs: Plugin reference update
2015-01-16 20:06:18 +00:00
Rich Slogar
3b7dbd66d8 Merge "docs: build link update" into lmp-docs 2015-01-16 00:27:50 +00:00
Rich Slogar
485b9566a9 Merge "docs: Plugin reference update" into lmp-docs 2015-01-16 00:27:05 +00:00
Rich Slogar
3bb85fb8c9 docs: build link update
Change-Id: I06a3e7fc914dff829bd1d210675daf5f99ba68e0
2015-01-07 13:54:30 -08:00
Joe Fernandez
d03afd4e57 am 633db0ee: am c4429f1f: am 001f6f54: am 66fefd0c: am a9a36ab2: Merge "docs: plugin link name update" into lmp-docs
automerge: 60906b5

* commit '60906b55ba63f24f94c2df0f6c856aad977d3213':
  docs: plugin link name update
2015-01-06 22:39:58 +00:00
Joe Fernandez
6d2dcbbd30 am 06cdc2fd: am 851931f0: am 21b92f34: am 43f4e8fa: am 27cb0a56: Merge "docs: gradle version update in plugin file" into lmp-docs
automerge: 629612a

* commit '629612a9d2d1a52809cd0549a1b6d2cbcf1a3d09':
  docs: gradle version update in plugin file
2015-01-06 19:58:32 +00:00
Joe Fernandez
414d895c11 am 4dc7c158: am 3dcc1289: am 447ea509: am f110d357: am 8eaf4042: Merge "docs: gradle wrapper security note" into lmp-docs
automerge: 148a578

* commit '148a57877ec5272a6768f427bd280a4d9c18acb1':
  docs: gradle wrapper security note
2015-01-06 19:56:46 +00:00
Joe Fernandez
f7f6bbc319 am 5ec2afea: am f3d9f030: am adaef486: am e78489b4: am e22b42b3: Merge "docs: plugin reference update" into lmp-docs
automerge: 4d0c931

* commit '4d0c931be7b63ebcd5789b99c5f561b411823485':
  docs: plugin reference update
2015-01-06 02:32:24 +00:00
Rich Slogar
c48e56eefb docs: Plugin reference update
Change-Id: I9a6cb3b904af907b6468ba07be73dd3487a15456
2014-12-30 12:09:05 -08:00
Joe Fernandez
a9a36ab225 Merge "docs: plugin link name update" into lmp-docs 2014-12-20 00:13:58 +00:00
Rich Slogar
c6127b0d34 docs: plugin link name update
b/18670573

Change-Id: I4cf509f4668c6308acbd5602b65129ba542aca71
2014-12-19 09:50:18 -08:00
Joe Fernandez
27cb0a5658 Merge "docs: gradle version update in plugin file" into lmp-docs 2014-12-19 05:34:07 +00:00
Joe Fernandez
8eaf404239 Merge "docs: gradle wrapper security note" into lmp-docs 2014-12-19 05:29:58 +00:00