9370 Commits

Author SHA1 Message Date
Scott Rowe
bd74a7022c am cee634df: am 11ce4b75: am c68ab86a: am ae15e779: am 224624e8: am c987ca05: Merge "docs: removing code captions" into lmp-docs
* commit 'cee634df2c8fe3a10a3aef754b3e168c646d47f3':
  docs: removing code captions
2015-01-17 05:38:02 +00:00
Scott Rowe
9d6f65e0a8 am ec015c50: am e019bbb1: am 278f5e2a: am 49caa638: am 78001f93: am ab18d6c8: Merge "docs: Add screenshot" into lmp-docs
* commit 'ec015c504fe2cb4c3171e0f405d1b3df0567b5f4':
  docs: Add screenshot
2015-01-17 05:37:55 +00:00
Scott Rowe
cee634df2c am 11ce4b75: am c68ab86a: am ae15e779: am 224624e8: am c987ca05: Merge "docs: removing code captions" into lmp-docs
* commit '11ce4b759497546f4182b00cc6b92cfe42acf32e':
  docs: removing code captions
2015-01-17 05:31:43 +00:00
Scott Rowe
ec015c504f am e019bbb1: am 278f5e2a: am 49caa638: am 78001f93: am ab18d6c8: Merge "docs: Add screenshot" into lmp-docs
* commit 'e019bbb1619700c952181fe9717060aaef7bce12':
  docs: Add screenshot
2015-01-17 05:31:36 +00:00
Scott Rowe
c68ab86a8c am ae15e779: am 224624e8: am c987ca05: Merge "docs: removing code captions" into lmp-docs
* commit 'ae15e779c0a0a9005292efb0f39729454429fa7f':
  docs: removing code captions
2015-01-17 05:20:28 +00:00
Scott Rowe
278f5e2a63 am 49caa638: am 78001f93: am ab18d6c8: Merge "docs: Add screenshot" into lmp-docs
* commit '49caa6386c1423ad9ced3e3ad983dd233a76e2e4':
  docs: Add screenshot
2015-01-17 05:20:23 +00:00
Scott Rowe
c987ca0501 Merge "docs: removing code captions" into lmp-docs 2015-01-17 01:31:53 +00:00
Scott Rowe
ab18d6c82e Merge "docs: Add screenshot" into lmp-docs 2015-01-17 01:31:15 +00:00
David Friedman
8d53179c9c am 1cca3f6e: am 912a9394: am 91678a69: am ae71c8ea: am e255cb0f: am fa66fdd5: Merge "Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw" into lmp-docs
* commit '1cca3f6e3939f59d1e17f35ca50339fa46d24c27':
  Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw
2015-01-17 01:09:05 +00:00
David Friedman
1cca3f6e39 am 912a9394: am 91678a69: am ae71c8ea: am e255cb0f: am fa66fdd5: Merge "Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw" into lmp-docs
* commit '912a9394398db1b47f0294ffdebc4d78600573fd':
  Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw
2015-01-17 00:59:45 +00:00
David Friedman
91678a69b2 am ae71c8ea: am e255cb0f: am fa66fdd5: Merge "Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw" into lmp-docs
* commit 'ae71c8ea52af7e4205ae838e73837d145f416e1a':
  Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw
2015-01-17 00:43:30 +00:00
David Friedman
fa66fdd57a Merge "Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw" into lmp-docs 2015-01-17 00:23:30 +00:00
David Friedman
d28a49fb73 Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw
Change-Id: I6555b9894a9ae4dc9365f21b40a75627fb7ed63f
2015-01-16 15:42:26 -08:00
Quddus Chong
7a11b88bcd am 6e2661f0: am 20eb8093: am 2f63207d: am a6491229: am 930ac01f: am de0a8700: Merge "docs: Fixed typos in Game Controller training code snippets. bug: 17959906" into lmp-docs
* commit '6e2661f086327c7ebbbda03f3387b673f0bf87df':
  docs: Fixed typos in Game Controller training code snippets. bug: 17959906
2015-01-16 22:56:45 +00:00
Quddus Chong
6e2661f086 am 20eb8093: am 2f63207d: am a6491229: am 930ac01f: am de0a8700: Merge "docs: Fixed typos in Game Controller training code snippets. bug: 17959906" into lmp-docs
* commit '20eb8093b634704ac29fda85e9c1c916a31bde29':
  docs: Fixed typos in Game Controller training code snippets. bug: 17959906
2015-01-16 22:50:17 +00:00
Joe Fernandez
090c5e01be am 6a8c2b03: am ff96449f: am 35aecbe9: am cd500663: am 90d2aca7: am 217d145d: Merge "docs: adding studio-sample-in-editor.png file" into lmp-docs
* commit '6a8c2b038c1d16856c642f80bf315828d1b96ad1':
  docs: adding studio-sample-in-editor.png file
2015-01-16 22:47:10 +00:00
Ricardo Cervera
ffff333c19 am eeb4cf8f: am 3fee7dc7: am 7a2e85c8: am 9273b33f: am 73f36d47: am e229751d: docs: Add browseable Wearable Support Lib Javadoc
* commit 'eeb4cf8f43797f99543db1e404066d5291da6237':
  docs: Add browseable Wearable Support Lib Javadoc
2015-01-16 22:47:05 +00:00
Joe Fernandez
6a8c2b038c am ff96449f: am 35aecbe9: am cd500663: am 90d2aca7: am 217d145d: Merge "docs: adding studio-sample-in-editor.png file" into lmp-docs
* commit 'ff96449f1d3092182d61d5e553042742d5bf71c8':
  docs: adding studio-sample-in-editor.png file
2015-01-16 22:41:01 +00:00
Ricardo Cervera
eeb4cf8f43 am 3fee7dc7: am 7a2e85c8: am 9273b33f: am 73f36d47: am e229751d: docs: Add browseable Wearable Support Lib Javadoc
* commit '3fee7dc78af70ac9ca383f40e511ffaa378894b1':
  docs: Add browseable Wearable Support Lib Javadoc
2015-01-16 22:40:55 +00:00
Quddus Chong
2f63207d87 am a6491229: am 930ac01f: am de0a8700: Merge "docs: Fixed typos in Game Controller training code snippets. bug: 17959906" into lmp-docs
* commit 'a649122977a6f1c267329b9b67a692cabd839e98':
  docs: Fixed typos in Game Controller training code snippets. bug: 17959906
2015-01-16 22:35:03 +00:00
Joe Fernandez
35aecbe927 am cd500663: am 90d2aca7: am 217d145d: Merge "docs: adding studio-sample-in-editor.png file" into lmp-docs
* commit 'cd50066386887148f99dce9b449bed588a354bb3':
  docs: adding studio-sample-in-editor.png file
2015-01-16 22:29:48 +00:00
Ricardo Cervera
7a2e85c83e am 9273b33f: am 73f36d47: am e229751d: docs: Add browseable Wearable Support Lib Javadoc
* commit '9273b33f6ecfa20ff524ae6fcb88f2586c79b6da':
  docs: Add browseable Wearable Support Lib Javadoc
2015-01-16 22:29:43 +00:00
Quddus Chong
de0a87007b Merge "docs: Fixed typos in Game Controller training code snippets. bug: 17959906" into lmp-docs 2015-01-16 22:03:33 +00:00
Joe Fernandez
217d145d49 Merge "docs: adding studio-sample-in-editor.png file" into lmp-docs 2015-01-16 21:58:37 +00:00
Rich Slogar
8f93abeb60 docs: adding studio-sample-in-editor.png file
Change-Id: I8b200eeb5134e9c66cb198f06ccfaa78a7f6a505
2015-01-16 12:26:20 -08:00
Joe Fernandez
46d2b80fe2 am 8871470c: am 5444e342: am fadcbc70: am b7ac4dff: am aafd29be: am 8304b8b9: Merge "docs: studio disk space requirements typo" into lmp-docs
* commit '8871470cedf4f6863fbba8c7d253607a9bac0246':
  docs: studio disk space requirements typo
2015-01-16 20:18:33 +00: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
Joe Fernandez
8871470ced am 5444e342: am fadcbc70: am b7ac4dff: am aafd29be: am 8304b8b9: Merge "docs: studio disk space requirements typo" into lmp-docs
* commit '5444e342c23e65d5efa3e9ef2b25cf0c7bfad468':
  docs: studio disk space requirements typo
2015-01-16 20:12:31 +00:00
Ricardo Cervera
23a6d889aa am 1e59b338: am 08314642: am 90312d80: am 22878790: am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev
* commit '1e59b338e6d1a270947908e53cefd088e2e38fb3':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
2015-01-16 20:06:53 +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
Dirk Dougherty
93aac801e5 am 05eb2055: am 8559b145: am f83ae5cd: am 7b7f074f: am d1ff8605: Merge "Doc change: Add new analytics information to Distribute." into lmp-docs
* commit '05eb2055038b91f43d61217ff261f3b7d9913513':
  Doc change: Add new analytics information to Distribute.
2015-01-16 20:06:28 +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
fadcbc705f am b7ac4dff: am aafd29be: am 8304b8b9: Merge "docs: studio disk space requirements typo" into lmp-docs
* commit 'b7ac4dff3d97865cde5d6876d30dde0a77848f25':
  docs: studio disk space requirements typo
2015-01-16 19:55:52 +00: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
Quddus Chong
03c15cf4c9 docs: Fixed typos in Game Controller training code snippets.
bug: 17959906

Change-Id: I2fa1b01704a69536b3d27fe6aa96c441d7f8fb27
2015-01-16 11:36:18 -08:00
Ricardo Cervera
e229751d11 docs: Add browseable Wearable Support Lib Javadoc
Change-Id: Ied1f25f637c529046b0adc1e1ea173a290b22da1
2015-01-16 11:18:10 -08:00
Joe Fernandez
8304b8b9ce Merge "docs: studio disk space requirements typo" into lmp-docs 2015-01-16 18:49:28 +00:00
Joe Fernandez
c84021ba99 Merge "docs: link to sdk manager" into lmp-docs 2015-01-16 18:47:54 +00:00
Ricardo Cervera
1e59b338e6 am 08314642: am 90312d80: am 22878790: am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev
* commit '083146428420dd3daa887d6e9c019e747a604cb5':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
2015-01-16 18:47:08 +00:00
Ricardo Cervera
90312d808f am 22878790: am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev
* commit '2287879039556ad3c8fce58974e2396b4a2dab45':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
2015-01-16 18:36:45 +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
Dirk Dougherty
05eb205503 am 8559b145: am f83ae5cd: am 7b7f074f: am d1ff8605: Merge "Doc change: Add new analytics information to Distribute." into lmp-docs
* commit '8559b145e69f0abd3fa1ae3dd23d253c69032a86':
  Doc change: Add new analytics information to Distribute.
2015-01-16 18:17:51 +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
Dirk Dougherty
f83ae5cd59 am 7b7f074f: am d1ff8605: Merge "Doc change: Add new analytics information to Distribute." into lmp-docs
* commit '7b7f074f282e551439b0b3c40a4ccb44d2981006':
  Doc change: Add new analytics information to Distribute.
2015-01-16 18:03:36 +00:00