857 Commits

Author SHA1 Message Date
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
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
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
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
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
Rich Slogar
639248789c docs: plugin for gradle typo
b/19106103

Change-Id: I3db503ccd5a93ee0a3bdf6dfb8c76f7391a5e75e
2015-01-23 09:57:37 -08:00
Rich Slogar
78f75b29fa docs: remove + annotations in version references
b/18417182

Change-Id: I16181a4ebb7a4ac40a7307438e120489b806f24e
2015-01-22 17:48:43 -08:00
Rich Slogar
b01e3fa104 docs: studio emulator platform update
b/5122160

Change-Id: I82966b0e9f32dc6e6641681f7726a8a8074525ff
2015-01-21 13:52:56 -08:00
Joe Fernandez
c2c9107fb9 am b5e3d2b0: am 5d320493: am 478d4e86: am 0b596de9: am c6f70adf: am c84021ba: Merge "docs: link to sdk manager" into lmp-docs
* commit 'b5e3d2b04368e7ad113d3f183464a66a96dcf9df':
  docs: link to sdk manager
2015-01-16 20:13:59 +00:00
Rich Slogar
c952235d9f am 39389af4: am f5af4a1e: am 8a7f20f5: am b43a7eef: am 3212c3aa: Merge "docs: studio support library revisions update" into lmp-docs
* commit '39389af4f1c08ffd1ad4511f2241ebeaca870191':
  docs: studio support library revisions update
2015-01-16 20:06:33 +00: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
Joe Fernandez
b5e3d2b043 am 5d320493: am 478d4e86: am 0b596de9: am c6f70adf: am c84021ba: Merge "docs: link to sdk manager" into lmp-docs
* commit '5d320493cb7605dcc579e9a9e3ee2bb5537413c4':
  docs: link to sdk manager
2015-01-16 20:02:51 +00:00
Rich Slogar
21d940c3cf resolved conflicts for merge of 20e7ab86 to master
Change-Id: I346419455a1a97c3eddb639188bcd81593887e97
2015-01-16 11:56:55 -08:00
Joe Fernandez
478d4e86ff am 0b596de9: am c6f70adf: am c84021ba: Merge "docs: link to sdk manager" into lmp-docs
* commit '0b596de9a4cc9b8d0694838f4b699c722d448bac':
  docs: link to sdk manager
2015-01-16 19:51:08 +00:00
Joe Fernandez
c84021ba99 Merge "docs: link to sdk manager" into lmp-docs 2015-01-16 18:47:54 +00:00
Rich Slogar
39389af4f1 am f5af4a1e: am 8a7f20f5: am b43a7eef: am 3212c3aa: Merge "docs: studio support library revisions update" into lmp-docs
* commit 'f5af4a1e34811730b1670ce686948e8dc182936b':
  docs: studio support library revisions update
2015-01-16 18:17:57 +00:00
Rich Slogar
cbe297d4d0 am e1a7b400: am a84faf0f: am 3505303a: am 3b7dbd66: Merge "docs: build link update" into lmp-docs
* commit 'e1a7b400ad0c3da1ff2c544f3ee7245ab62649dd':
  docs: build link update
2015-01-16 18:17:45 +00:00
Rich Slogar
7d8a43f233 am cd0bdc35: am ab8a5a0e: am f1feda36: am 485b9566: Merge "docs: Plugin reference update" into lmp-docs
* commit 'cd0bdc35eb0dc04f615ae94626dd9b01e7ab2890':
  docs: Plugin reference update
2015-01-16 18:17:40 +00:00