9193 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Ricardo Cervera
93f94c2ca5 resolved conflicts for merge of e8f6bd48 to lmp-dev
Change-Id: Idc370182914d5060a721d34c26cd72598f2c6dff
2015-01-16 09:54:30 -08:00
Ricardo Cervera
97c4ba9862 docs: Added info on noHistory and onActivityResult().
Bug: 13807256

Cherry-pick from Iae4901a311e76401396f89c552e5b27a49c65c83

Change-Id: I4ad7aea1a3c7ea82bc2bbcdf35d2de418ef7b90f
2015-01-16 09:24:30 -08:00
Ricardo Cervera
e8f6bd4846 am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256
* commit '98f07d901492335f51258655fbfa032fa3f2d58e':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
2015-01-16 17:21:32 +00:00
Ricardo Cervera
98f07d9014 am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256
* commit '92f6a747085b4b5ed692de4bdb0050c096eae393':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
2015-01-16 17:14:44 +00:00
Rich Slogar
3212c3aa22 Merge "docs: studio support library revisions update" into lmp-docs 2015-01-16 00:43:57 +00:00
Dirk Dougherty
d1ff86058a Merge "Doc change: Add new analytics information to Distribute." into lmp-docs 2015-01-16 00:41:56 +00:00
Dirk Dougherty
27ab5a079b Doc change: Add new analytics information to Distribute.
Change-Id: I0ce5c457469cc2628dad8a1b7254fc9068babc84
2015-01-15 16:28:13 -08: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
Luan Nguyen
34a1a10d51 am b47cf562: am e184b2f2: am d5a114cd: am d3cc11a1: docs: Remove reference to handheld app for bitmap resource locations.
* commit 'b47cf562bbbc08e45a6ae38e1ae98a36e6928caf':
  docs: Remove reference to handheld app for bitmap resource locations.
2015-01-15 19:47:32 +00:00
Luan Nguyen
e184b2f235 am d5a114cd: am d3cc11a1: docs: Remove reference to handheld app for bitmap resource locations.
* commit 'd5a114cd0e15bdd263bfd9704bdfeacd28dfe670':
  docs: Remove reference to handheld app for bitmap resource locations.
2015-01-15 19:36:35 +00:00
Luan Nguyen
d3cc11a164 docs: Remove reference to handheld app for bitmap resource locations.
bug: 17577838
Change-Id: I54cfd7a73d21464077d8644bbe1a2d8896f745e6
2015-01-15 09:24:09 -08:00
Scott Rowe
c222198a2c docs: removing code captions
Change-Id: Ifbeedf014741ff680640e1bdd0b35fa2d68f9e45
2015-01-14 14:27:30 -08:00
Ricardo Cervera
c2d9505219 am 62ceea31: am f5569413: docs: Fix broken link in Common Intents automerge: c2d373a automerge: 8eb3060
automerge: cca3d44

* commit 'cca3d44b700db945e23ad357b031d7f6397e18b9':
  docs: Fix broken link in Common Intents
2015-01-13 17:01:48 +00:00
Ricardo Cervera
8eb306077d am 62ceea31: am f5569413: docs: Fix broken link in Common Intents automerge: c2d373a
* commit '62ceea31564ac27c84ff78b400f844be98917c29':
  docs: Fix broken link in Common Intents
2015-01-13 16:49:57 +00:00
Ricardo Cervera
f556941357 docs: Fix broken link in Common Intents
Bug: 18991366

Change-Id: I998e5213bb7117ebd26ab335206f430f60d1c537
2015-01-13 08:28:22 -08:00
Scott Rowe
8443fad483 docs: Add screenshot
Change-Id: I0995d23e1df30ce17ce381c14a6cbd2de389c396
2015-01-12 14:50:50 -08:00
Ricardo Cervera
5849c0e4c6 am 9a19ed17: am eec6dd77: am a87f3555: am d8bd117c: Merge "docs: Add parent calls to WatchFaces snippet." into lmp-docs
automerge: cb09d8d

* commit 'cb09d8d08a3628561a58f19713b9358eafa32738':
  docs: Add parent calls to WatchFaces snippet.
2015-01-12 22:26:58 +00:00
Ricardo Cervera
9a19ed17e1 am eec6dd77: am a87f3555: am d8bd117c: Merge "docs: Add parent calls to WatchFaces snippet." into lmp-docs
* commit 'eec6dd779ca170a80ff457828e2687da834d2c1f':
  docs: Add parent calls to WatchFaces snippet.
2015-01-12 22:16:09 +00:00