871 Commits

Author SHA1 Message Date
Rich Slogar
c8c8cbc6e5 am f1b49e4c: am 5f21a4dc: am cd0425d6: am aba93780: am 5b60b1a0: am a91f6d00: am 4a99918b: Merge "docs: android plugin revisions page v2" into lmp-docs
* commit 'f1b49e4c51ef41e4d8a94497586b986c82b62293':
  docs: android plugin revisions page v2
2015-02-21 02:02:16 +00:00
Rich Slogar
f1b49e4c51 am 5f21a4dc: am cd0425d6: am aba93780: am 5b60b1a0: am a91f6d00: am 4a99918b: Merge "docs: android plugin revisions page v2" into lmp-docs
* commit '5f21a4dc7d2f34759e8035a1a98d0c8e4794286c':
  docs: android plugin revisions page v2
2015-02-21 01:35:38 +00:00
Rich Slogar
aba93780b4 am 5b60b1a0: am a91f6d00: am 4a99918b: Merge "docs: android plugin revisions page v2" into lmp-docs
* commit '5b60b1a0401afb4d1addf53ca40facb5b5f6c0ee':
  docs: android plugin revisions page v2
2015-02-21 01:04:52 +00:00
Rich Slogar
4a99918b40 Merge "docs: android plugin revisions page v2" into lmp-docs 2015-02-21 00:44:50 +00:00
Rich Slogar
ed1cf523ad docs: android plugin revisions page v2
Change-Id: Ifdefd66149a34590e3d195a9b290bc3be111caf2
2015-02-20 09:52:13 -08:00
Rich Slogar
64d090d85a am 93cd3929: am c905da57: am 5af2270b: am cd9c0cab: am 708959b5: am 755c5d88: am 56375d90: docs: lint inspection updates
* commit '93cd3929ae757e499c13a03f575c4bd0721ac4b6':
  docs: lint inspection updates
2015-02-18 23:50:14 +00:00
Rich Slogar
93cd3929ae am c905da57: am 5af2270b: am cd9c0cab: am 708959b5: am 755c5d88: am 56375d90: docs: lint inspection updates
* commit 'c905da575c422a3b905e116724a24c73bcf2d0b4':
  docs: lint inspection updates
2015-02-18 23:43:29 +00:00
Rich Slogar
cd9c0cab77 am 708959b5: am 755c5d88: am 56375d90: docs: lint inspection updates
* commit '708959b5326b7877553397fc17237e02f0d3adb1':
  docs: lint inspection updates
2015-02-18 23:21:27 +00:00
Rich Slogar
56375d9066 docs: lint inspection updates
Change-Id: I870533a8b22b54b848b9245387ca40d79e49295f
2015-02-18 14:17:21 -08:00
Rich Slogar
90fa535569 am 27672017: am 6b5c3802: am c9cc2c22: am bd1fb402: am e0f61e1c: am 717b4d13: Merge "docs: note to install linux packages" into lmp-docs automerge: 0f60943
* commit '27672017956f5bb672cab15d0f0094018b6fa9d9':
  docs: note to install linux packages
2015-02-18 11:37:57 +00:00
Rich Slogar
6c65063aa0 am e9d86f58: am 9f807e7e: am 6de1fd98: am 502f303c: am d72bea9d: am 40132ee1: Merge "docs: site mipmap folder updates" into lmp-docs automerge: 797c989
* commit 'e9d86f585399c69d8930b7cdfb0464f0ddd5f49a':
  docs: site mipmap folder updates
2015-02-18 11:13:15 +00:00
Chris Banes
6026f73406 resolved conflicts for merge of 1c131eeb to master
Change-Id: I886d726322514fa3b27cdc80b8dd57faa94bade5
2015-02-18 11:02:49 +00:00
Rich Slogar
2767201795 am 6b5c3802: am c9cc2c22: am bd1fb402: am e0f61e1c: am 717b4d13: Merge "docs: note to install linux packages" into lmp-docs automerge: 0f60943
* commit '6b5c3802e1a8bd6a17b89ff8ce17aee13e9b2842':
  docs: note to install linux packages
2015-02-18 00:33:02 +00:00
Rich Slogar
e9d86f5853 am 9f807e7e: am 6de1fd98: am 502f303c: am d72bea9d: am 40132ee1: Merge "docs: site mipmap folder updates" into lmp-docs automerge: 797c989
* commit '9f807e7ef2793e02b592afa33d73633bb9343c4c':
  docs: site mipmap folder updates
2015-02-18 00:32:32 +00:00
Rich Slogar
1c131eeb99 am 27402330: am b7fee4f4: am 6cdde671: am 43fb9e42: am 3c3b780c: Merge "docs: studio mipmap update" into lmp-docs automerge: c694604
* commit '2740233048452a10f5eebd0117e7c598faa65c80':
  docs: studio mipmap update
2015-02-18 00:32:25 +00:00
Rich Slogar
7a217113d8 am 65d12bf7: am c7067053: am 2b29d96f: am 82510fa5: am 9c9a3afb: am 8823b93d: Merge changes If3a78fc7,Ifbe3f03a into lmp-docs automerge: fa40f00
* commit '65d12bf7f14ff7568cc3011793e219391f9c3d29':
  docs: studio proxy setting setup
  docs: studio proxy setup
2015-02-18 00:30:08 +00:00
Rich Slogar
bd1fb4021f am e0f61e1c: am 717b4d13: Merge "docs: note to install linux packages" into lmp-docs
automerge: 0f60943

* commit '0f609432222e9eb946bfaa2bee45301324b97311':
  docs: note to install linux packages
2015-02-18 00:18:54 +00:00
Rich Slogar
502f303c61 am d72bea9d: am 40132ee1: Merge "docs: site mipmap folder updates" into lmp-docs
automerge: 797c989

* commit '797c989e3be0d081098866206b0e5829a7fe2ce2':
  docs: site mipmap folder updates
2015-02-18 00:13:07 +00:00
Rich Slogar
6cdde6718c am 43fb9e42: am 3c3b780c: Merge "docs: studio mipmap update" into lmp-docs
automerge: c694604

* commit 'c694604ec58fc16f2526c8689b0def0fbcfb6fc7':
  docs: studio mipmap update
2015-02-18 00:11:42 +00:00
Rich Slogar
717b4d130f Merge "docs: note to install linux packages" into lmp-docs 2015-02-17 23:54:50 +00:00
Rich Slogar
af825ef7b6 am dbb32faf: am 8c124744: am 76dd6aa7: Merge "docs: studio revision 1-1" into lmp-docs automerge: bff1545 automerge: 696ea51
automerge: 0a87137

* commit '0a8713799cb6ebab4f40ef3313ea71df9c580146':
  docs: studio revision 1-1
2015-02-17 23:44:47 +00:00
Rich Slogar
e4c42929e9 am 2d43b730: am d2856643: am 4abf87f1: Merge "docs: android plugin for gradle revisions page" into lmp-docs automerge: cb73fb9 automerge: 4826bed
automerge: 7b3a118

* commit '7b3a11802ad2c344577f651f1a0ef5083b4133eb':
  docs: android plugin for gradle revisions page
2015-02-17 23:43:03 +00:00
Rich Slogar
65d12bf7f1 am c7067053: am 2b29d96f: am 82510fa5: am 9c9a3afb: am 8823b93d: Merge changes If3a78fc7,Ifbe3f03a into lmp-docs automerge: fa40f00
* commit 'c7067053252413f78edbd6f21618a65a72235542':
  docs: studio proxy setting setup
  docs: studio proxy setup
2015-02-17 22:51:48 +00:00
Rich Slogar
0a8713799c am dbb32faf: am 8c124744: am 76dd6aa7: Merge "docs: studio revision 1-1" into lmp-docs automerge: bff1545
automerge: 696ea51

* commit '696ea51a1c7c01061daf8693101e48d5d0701293':
  docs: studio revision 1-1
2015-02-17 22:45:49 +00:00
Rich Slogar
7b3a11802a am 2d43b730: am d2856643: am 4abf87f1: Merge "docs: android plugin for gradle revisions page" into lmp-docs automerge: cb73fb9
automerge: 4826bed

* commit '4826bed5dbb07bc819db071b02de7c30925ff8a6':
  docs: android plugin for gradle revisions page
2015-02-17 22:43:17 +00:00
Rich Slogar
82510fa5a6 am 9c9a3afb: am 8823b93d: Merge changes If3a78fc7,Ifbe3f03a into lmp-docs
automerge: fa40f00

* commit 'fa40f0072f4eb24d0e2b641bf7b4235e99362c1e':
  docs: studio proxy setting setup
  docs: studio proxy setup
2015-02-17 22:28:45 +00:00
Rich Slogar
dbb32faf33 am 8c124744: am 76dd6aa7: Merge "docs: studio revision 1-1" into lmp-docs
automerge: bff1545

* commit 'bff1545a3e6a3c296a8ffcefb5f1141f9a21c5d1':
  docs: studio revision 1-1
2015-02-17 22:25:53 +00:00
Rich Slogar
2d43b7300d am d2856643: am 4abf87f1: Merge "docs: android plugin for gradle revisions page" into lmp-docs
automerge: cb73fb9

* commit 'cb73fb90443a3a3fee645aa3f01d38b19f108377':
  docs: android plugin for gradle revisions page
2015-02-17 22:24:38 +00:00
Rich Slogar
40132ee15a Merge "docs: site mipmap folder updates" into lmp-docs 2015-02-17 22:08:42 +00:00
Rich Slogar
3c3b780cae Merge "docs: studio mipmap update" into lmp-docs 2015-02-17 22:06:46 +00:00
Rich Slogar
8823b93d5c Merge changes If3a78fc7,Ifbe3f03a into lmp-docs
* changes:
  docs: studio proxy setting setup
  docs: studio proxy setup
2015-02-17 22:02:45 +00:00
Rich Slogar
76dd6aa7f9 Merge "docs: studio revision 1-1" into lmp-docs 2015-02-17 20:37:52 +00:00
Rich Slogar
69223702e4 docs: site mipmap folder updates
b/12874352

Change-Id: I0b32502c8075740c66f04203110c9bfe8be103f9
2015-02-17 12:34:35 -08:00
Rich Slogar
4abf87f134 Merge "docs: android plugin for gradle revisions page" into lmp-docs 2015-02-17 20:16:09 +00:00
Rich Slogar
38f2242e39 docs: studio mipmap update
Change-Id: Id493c079186585a29a8c6b1ba57d921a7327868d
2015-02-13 17:17:41 -08:00
Rich Slogar
0726a31f2b docs: studio proxy setting setup
b/18332702

Change-Id: If3a78fc7b906bb94cfa74fc07b95ef72a84cf825
2015-02-13 16:44:32 -08:00
Rich Slogar
9bd6de1eac docs: studio revision 1-1
Change-Id: I7464ace70e9b9e430fd0f03329e20b64b1e1a56a
2015-02-13 15:19:31 -08:00
Rich Slogar
3150bb78e6 docs: android plugin for gradle revisions page
Change-Id: I15750eb11f69f9286fdd542c8e5a5e702b1a1255
2015-02-13 14:58:10 -08:00
Joe Fernandez
6bfe8325b9 am e3bc656a: am a8b341cd: am 5ac30e10: am 66c06cf9: am d224fb8a: am ba20f98c: Merge "docs: remove + annotations in version references" into lmp-docs
automerge: 843b2c7

* commit '843b2c7aa9e38f39732a279d7901f66893b37ab7':
  docs: remove + annotations in version references
2015-02-07 01:56:15 +00:00
Joe Fernandez
843b2c7aa9 am e3bc656a: am a8b341cd: am 5ac30e10: am 66c06cf9: am d224fb8a: am ba20f98c: Merge "docs: remove + annotations in version references" into lmp-docs
* commit 'e3bc656a623b34d523001e628e779fe2f69e0fb1':
  docs: remove + annotations in version references
2015-02-07 01:53:04 +00:00
Joe Fernandez
5ac30e10ab am 66c06cf9: am d224fb8a: am ba20f98c: Merge "docs: remove + annotations in version references" into lmp-docs
* commit '66c06cf9bb4fa3ba1477e120843e8fdb8a360e4e':
  docs: remove + annotations in version references
2015-02-07 01:13:52 +00:00
Joe Fernandez
ba20f98c88 Merge "docs: remove + annotations in version references" into lmp-docs 2015-02-07 00:55:17 +00: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
317c8ac2df am 52c39c27: am 5c37c8e6: am d801a123: am 2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs automerge: 3548de6 automerge: 95fa882
* commit '52c39c27e9f5fde74e2d326c6a3560334fbea926':
  docs: studio emulator platform update
2015-01-31 00:34:50 +00:00
Joe Fernandez
52c39c27e9 am 5c37c8e6: am d801a123: am 2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs automerge: 3548de6
automerge: 95fa882

* commit '95fa88250a1957c7adfbd35d52f62e42cbe03df6':
  docs: studio emulator platform update
2015-01-31 00:29:37 +00:00
Joe Fernandez
3548de6073 am 5c37c8e6: am d801a123: am 2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs
* commit '5c37c8e66227b15d471047e7c4c986cf3c67876a':
  docs: studio emulator platform update
2015-01-31 00:14:39 +00:00
Joe Fernandez
2b68ab3add Merge "docs: studio emulator platform update" into lmp-docs 2015-01-30 23:25:51 +00: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
Joe Fernandez
617af27167 am 3961def5: am f8afd564: am c6326f44: am 05defb99: Merge "docs: plugin for gradle typo" into lmp-docs automerge: 5421eee
* commit '3961def5a917eff8afcb50aa4c718bd9cd4351a5':
  docs: plugin for gradle typo
2015-01-28 04:30:47 +00:00
Joe Fernandez
f8afd56406 am c6326f44: am 05defb99: Merge "docs: plugin for gradle typo" into lmp-docs
automerge: 5421eee

* commit '5421eee195265d05c821814501aae1bf3f468661':
  docs: plugin for gradle typo
2015-01-28 04:14:54 +00:00