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
bad68bcf39
am 34a1a10d: am b47cf562: am e184b2f2: am d5a114cd: am d3cc11a1: docs: Remove reference to handheld app for bitmap resource locations.
...
* commit '34a1a10d51af331be139849c6c0ada109bc64a63':
docs: Remove reference to handheld app for bitmap resource locations.
2015-01-15 22:17:50 +00: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
f76ea8e4f9
am c2d95052: am 62ceea31: am f5569413: docs: Fix broken link in Common Intents automerge: c2d373a automerge: 8eb3060 automerge: cca3d44
...
* commit 'c2d950521919f35c75d60013276fb422789151a2':
docs: Fix broken link in Common Intents
2015-01-13 20:33:19 +00:00
Ricardo Cervera
abccd9d3c9
am 5849c0e4: am 9a19ed17: am eec6dd77: am a87f3555: am d8bd117c: Merge "docs: Add parent calls to WatchFaces snippet." into lmp-docs automerge: cb09d8d
...
* commit '5849c0e4c6f8bf44de44e964ce365c0959070494':
docs: Add parent calls to WatchFaces snippet.
2015-01-13 20:32:15 +00:00
Joe Fernandez
07b4bfac5d
am e3c10bf9: am d15b54d2: am 0bb84bb5: am 661ca547: am 8062f1f3: Merge "docs: Removing obsolete L-Preview docs and images" into lmp-docs automerge: d3b6d61
...
* commit 'e3c10bf96c93672831a1126dea66b81eb52f7a43':
docs: Removing obsolete L-Preview docs and images
2015-01-13 20:31:54 +00:00
Joe Fernandez
67e0249df0
am eabea18e: am 520a3c82: am acd5f3ab: am 1946978c: am 76110e7c: docs: Remove Wear preview reference docs automerge: 56c56f7
...
* commit 'eabea18ee897313c10091a653db3762321c3a40c':
docs: Remove Wear preview reference docs
2015-01-13 20:31:48 +00:00
Eric Gilmore
f8e8fc5fb2
am c6a22851: am 3fca2e7f: am 10b829e1: am fec824b6: Merge "Adding Android Fundamentals video." into lmp-docs automerge: 39b167a
...
automerge: 85ac9f1
* commit '85ac9f153b3b1e2d1ed0c0fa571fe3dde5de8bd2':
Adding Android Fundamentals video.
2015-01-13 20:28:40 +00:00
Eric Gilmore
1ff978a239
am c726557c: am 2c7e5631: am 7862ba29: am 6c8b80ac: Merge "Removing three obsolete lessons from TOC, which in turn removes them from building-userinfo.jd when built." into lmp-docs automerge: 1908515
...
automerge: 979dc00
* commit '979dc00bb9061d4bf448b9880096a323d06f19dd':
Removing three obsolete lessons from TOC, which in turn removes them from building-userinfo.jd when built.
2015-01-13 20:23:29 +00: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
Joe Fernandez
e3c10bf96c
am d15b54d2: am 0bb84bb5: am 661ca547: am 8062f1f3: Merge "docs: Removing obsolete L-Preview docs and images" into lmp-docs
...
automerge: d3b6d61
* commit 'd3b6d61d1320aca69c22fd597197b8dd6de61799':
docs: Removing obsolete L-Preview docs and images
2015-01-12 21:49:30 +00:00
Ricardo Cervera
d8bd117ce0
Merge "docs: Add parent calls to WatchFaces snippet." into lmp-docs
2015-01-12 21:49:23 +00:00
Joe Fernandez
eabea18ee8
am 520a3c82: am acd5f3ab: am 1946978c: am 76110e7c: docs: Remove Wear preview reference docs
...
automerge: 56c56f7
* commit '56c56f7d20f7c7621f746955dd275d252ca37732':
docs: Remove Wear preview reference docs
2015-01-12 21:39:30 +00:00
Joe Fernandez
d15b54d23f
am 0bb84bb5: am 661ca547: am 8062f1f3: Merge "docs: Removing obsolete L-Preview docs and images" into lmp-docs
...
* commit '0bb84bb5e2a137475718e31fb25f06b160163588':
docs: Removing obsolete L-Preview docs and images
2015-01-12 21:39:24 +00:00
Joe Fernandez
520a3c8258
am acd5f3ab: am 1946978c: am 76110e7c: docs: Remove Wear preview reference docs
...
* commit 'acd5f3ab40c81b5267b4b551e0fd55ce839351b9':
docs: Remove Wear preview reference docs
2015-01-12 21:31:02 +00:00
Joe Fernandez
8062f1f341
Merge "docs: Removing obsolete L-Preview docs and images" into lmp-docs
2015-01-12 21:23:17 +00:00
Ricardo Cervera
afd23aba8e
docs: Add parent calls to WatchFaces snippet.
...
Bug: 18982021
Change-Id: I2b39255827826d1e097ccba97e90e92a587fc39b
2015-01-12 12:54:32 -08:00
Joe Fernandez
76110e7c46
docs: Remove Wear preview reference docs
...
These docs are out of date and unreachable due to redirect rules.
Change-Id: I76d9ccfff139b2377c45d71af2998a99b82a2f14
2015-01-12 10:28:03 -08:00
Joe Fernandez
05d9a5107f
docs: Removing obsolete L-Preview docs and images
...
- /preview/images/
- TV Preview index pages
- Notifications preview page
Change-Id: I3e7c4e06bcdb6804fd83a80a8171a9d8e0c57117
2015-01-12 10:20:41 -08:00
Eric Gilmore
85ac9f153b
am c6a22851: am 3fca2e7f: am 10b829e1: am fec824b6: Merge "Adding Android Fundamentals video." into lmp-docs
...
automerge: 39b167a
* commit '39b167a644f3859a59e814662295c9247b77f0b9':
Adding Android Fundamentals video.
2015-01-12 17:26:22 +00:00
Eric Gilmore
c6a228511c
am 3fca2e7f: am 10b829e1: am fec824b6: Merge "Adding Android Fundamentals video." into lmp-docs
...
* commit '3fca2e7fee3d657c74406f8405bc1d669b9392e8':
Adding Android Fundamentals video.
2015-01-12 17:19:05 +00:00
Eric Gilmore
979dc00bb9
am c726557c: am 2c7e5631: am 7862ba29: am 6c8b80ac: Merge "Removing three obsolete lessons from TOC, which in turn removes them from building-userinfo.jd when built." into lmp-docs
...
automerge: 1908515
* commit '1908515d59b57ebad82c0ee655caa0f5494c8b86':
Removing three obsolete lessons from TOC, which in turn removes them from building-userinfo.jd when built.
2015-01-12 17:05:01 +00:00
Eric Gilmore
fec824b611
Merge "Adding Android Fundamentals video." into lmp-docs
2015-01-12 17:02:32 +00:00
Eric Gilmore
c726557cbd
am 2c7e5631: am 7862ba29: am 6c8b80ac: Merge "Removing three obsolete lessons from TOC, which in turn removes them from building-userinfo.jd when built." into lmp-docs
...
* commit '2c7e563181405ae6a91edb57f654f884b8759c8e':
Removing three obsolete lessons from TOC, which in turn removes them from building-userinfo.jd when built.
2015-01-12 16:55:40 +00:00
Rich Slogar
0c1228bb27
docs: link to sdk manager
...
Change-Id: I41f656e2eee1189298292e3bcca387de05e0e3c7
2015-01-09 16:33:32 -08:00