Commit Graph

1276 Commits

Author SHA1 Message Date
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
Rich Slogar
20e7ab8667 am d6ed0384: am d15015d2: am f38122da: am 48fc1d7b: Merge "docs: studio sample procedure update" into lmp-docs
* commit 'd6ed0384bf75f23f4184eb92297a4ff8b7f5c090':
  docs: studio sample procedure update
2015-01-16 18:17:33 +00:00
Rich Slogar
8a7f20f5a4 am b43a7eef: am 3212c3aa: Merge "docs: studio support library revisions update" into lmp-docs
* commit 'b43a7eefb75b2a6397d738055389567e1faa21d9':
  docs: studio support library revisions update
2015-01-16 18:03:41 +00:00
Rich Slogar
a84faf0f15 am 3505303a: am 3b7dbd66: Merge "docs: build link update" into lmp-docs
* commit '3505303a3aa113058bca58a1cdf3c84449b6712e':
  docs: build link update
2015-01-16 18:03:32 +00:00
Rich Slogar
ab8a5a0ea8 am f1feda36: am 485b9566: Merge "docs: Plugin reference update" into lmp-docs
* commit 'f1feda36fbaebf22bf3e06d05ae186ada39a3e1e':
  docs: Plugin reference update
2015-01-16 18:03:28 +00:00
Rich Slogar
d15015d206 am f38122da: am 48fc1d7b: Merge "docs: studio sample procedure update" into lmp-docs
* commit 'f38122dae0a344bc8abe3eaed7322ea3675b05f5':
  docs: studio sample procedure update
2015-01-16 18:03:23 +00:00
Rich Slogar
3212c3aa22 Merge "docs: studio support library revisions update" into lmp-docs 2015-01-16 00:43:57 +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
48fc1d7ba7 Merge "docs: studio sample procedure update" into lmp-docs 2015-01-16 00:26:39 +00:00
Rich Slogar
d7beb6d3eb docs: studio support library revisions update
Change-Id: I9df9ffbcbb99e8b661ee5b67ac0efe28d6d19b4b
2015-01-15 16:20:44 -08:00
Rich Slogar
0c1228bb27 docs: link to sdk manager
Change-Id: I41f656e2eee1189298292e3bcca387de05e0e3c7
2015-01-09 16:33:32 -08:00
Rich Slogar
3bb85fb8c9 docs: build link update
Change-Id: I06a3e7fc914dff829bd1d210675daf5f99ba68e0
2015-01-07 13:54:30 -08:00
Joe Fernandez
de60e6d00a am 912b2574: am 52aec00c: am ca14e6c8: am f50be1fc: am 91c35ce1: Merge "docs: studio index typo" into lmp-docs
automerge: 87df2ea

* commit '87df2ea08fbb9360910c006ca920c43e5165b604':
  docs: studio index typo
2015-01-07 10:22:55 +00:00
Joe Fernandez
87df2ea08f am 912b2574: am 52aec00c: am ca14e6c8: am f50be1fc: am 91c35ce1: Merge "docs: studio index typo" into lmp-docs
* commit '912b25743d241caa150fd56aa15d1a6b9c59e428':
  docs: studio index typo
2015-01-07 10:17:26 +00:00
Joe Fernandez
52aec00cb4 am ca14e6c8: am f50be1fc: am 91c35ce1: Merge "docs: studio index typo" into lmp-docs
* commit 'ca14e6c8326136686d3de796f1fcd7eb2b5aebe3':
  docs: studio index typo
2015-01-07 09:22:58 +00: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
60906b55ba am 633db0ee: am c4429f1f: am 001f6f54: am 66fefd0c: am a9a36ab2: Merge "docs: plugin link name update" into lmp-docs
* commit '633db0ee6644d3bb1f59ea274bb05cfa305daa5c':
  docs: plugin link name update
2015-01-06 22:35:41 +00:00
Joe Fernandez
c4429f1fac am 001f6f54: am 66fefd0c: am a9a36ab2: Merge "docs: plugin link name update" into lmp-docs
* commit '001f6f5451a71da328c3e05b4da1ad3bf24ad613':
  docs: plugin link name update
2015-01-06 22:21:43 +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
Nick Kralevich
cfea9fbc53 resolved conflicts for merge of 175ef812 to master
Change-Id: I2c6f407fa56b13c54571f8a51573a4b45d251dbb
2015-01-06 11:50:08 -08:00
Joe Fernandez
17197b856b am e7558b44: am 596868b6: am c811b88a: am d3d09d87: am 66e851fa: Merge "docs: studio workflow links" into lmp-docs
automerge: 8109599b

* commit '8109599b1c6306d1f2239a88f0cf9ba3ea584f2b':
  docs: studio workflow links
2015-01-06 19:36:41 +00:00
Joe Fernandez
91c35ce153 Merge "docs: studio index typo" into lmp-docs 2015-01-06 17:50:58 +00:00
Joe Fernandez
1b0c367a32 am bea6f1e6: am b1062ad6: am c3fb32ab: am 4603c122: am 18a75595: Merge "docs: studio device emulator updates" into lmp-docs
automerge: 66a49d9

* commit '66a49d994c997e74fcab7ce5b4e334cfd742d36c':
  docs: studio device emulator updates
2015-01-06 02:37:41 +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
Joe Fernandez
629612a9d2 am 06cdc2fd: am 851931f0: am 21b92f34: am 43f4e8fa: am 27cb0a56: Merge "docs: gradle version update in plugin file" into lmp-docs
* commit '06cdc2fd640c37b7251bc5ce37051e4da0b3552a':
  docs: gradle version update in plugin file
2015-01-06 02:26:49 +00:00
Joe Fernandez
148a57877e am 4dc7c158: am 3dcc1289: am 447ea509: am f110d357: am 8eaf4042: Merge "docs: gradle wrapper security note" into lmp-docs
* commit '4dc7c15860faa53f6cc408046959c7e8e6ebfd51':
  docs: gradle wrapper security note
2015-01-06 02:26:44 +00:00
Joe Fernandez
175ef8121b am 24a3ff47: am 765ae116: am eed87a57: am 09b41c02: am e6395cd3: Merge "docs: project file and toc updates" into lmp-docs
* commit '24a3ff477037a634e7ae6bc99908faebd530d0a9':
  docs: project file and toc updates
2015-01-06 02:26:38 +00:00
Joe Fernandez
8109599b1c am e7558b44: am 596868b6: am c811b88a: am d3d09d87: am 66e851fa: Merge "docs: studio workflow links" into lmp-docs
* commit 'e7558b44f707979cb4f85b0ccd0862b9ea068ee6':
  docs: studio workflow links
2015-01-06 02:26:32 +00:00
Joe Fernandez
66a49d994c am bea6f1e6: am b1062ad6: am c3fb32ab: am 4603c122: am 18a75595: Merge "docs: studio device emulator updates" into lmp-docs
* commit 'bea6f1e6457841b8be4e45ecb713762894799f7a':
  docs: studio device emulator updates
2015-01-06 02:26:11 +00:00
Joe Fernandez
4d0c931be7 am 5ec2afea: am f3d9f030: am adaef486: am e78489b4: am e22b42b3: Merge "docs: plugin reference update" into lmp-docs
* commit '5ec2afea01be51e5607e445c401be3296f1ac83e':
  docs: plugin reference update
2015-01-06 02:25:47 +00:00