9624 Commits

Author SHA1 Message Date
Scott Rowe
ec1e8aa6af am 4ca01ef2: am 2d1c5dc8: am e4249f29: am 87a1bf09: docs: b/19193358 Android TV overscan instructions: settings reversed in text automerge: 9ad282f
* commit '4ca01ef21d7eacf398989740c6985a97891111e6':
  docs: b/19193358 Android TV overscan instructions: settings reversed in text
2015-01-30 02:13:34 +00:00
Rich Slogar
e9e2707fef am f4fa2acb: am 6ccb72e6: am e0063faa: Merge "docs: linux requirements update" into lmp-docs
* commit 'f4fa2acb22acdf2ddb536fd1e7e5b9df51d6a787':
  docs: linux requirements update
2015-01-30 01:58:22 +00:00
Scott Rowe
1b5a0fb681 am 8f5714d3: am a3031211: am b86c3b80: Merge "docs: Card View for Android TV training" into lmp-docs
* commit '8f5714d3e1f29c0ec761c3471a12d2f486bbaee3':
  docs: Card View for Android TV training
2015-01-30 01:53:53 +00:00
Scott Rowe
9ad282fd73 am 2d1c5dc8: am e4249f29: am 87a1bf09: docs: b/19193358 Android TV overscan instructions: settings reversed in text
* commit '2d1c5dc8ef3dfa8e4eea25197b38b654d7e8cc9d':
  docs: b/19193358 Android TV overscan instructions: settings reversed in text
2015-01-30 01:53:48 +00:00
Rich Slogar
e0063faa87 Merge "docs: linux requirements update" into lmp-docs 2015-01-30 01:32:18 +00:00
Scott Rowe
b86c3b80db Merge "docs: Card View for Android TV training" into lmp-docs 2015-01-30 01:30:44 +00:00
Scott Rowe
87a1bf0970 docs: b/19193358 Android TV overscan instructions: settings reversed in text
Change-Id: I7c617ed67068927d27c5a2243a2dd07b04e668b5
2015-01-29 11:05:13 -08:00
Scott Rowe
da0c5de5fa docs: Card View for Android TV training
Change-Id: I4797c0b3c4ae7106349095016d778992802ccb96
2015-01-29 10:50:25 -08:00
Dirk Dougherty
448080dcbc am 820d5c52: am 8b1ad8e4: am 49738792: Doc change: Update Ads terms language. automerge: 3f9d57d automerge: e0b5a38
automerge: 1cbe026

* commit '1cbe026b932fa7820ab1ab27833a4a1bf1ff3ebf':
  Doc change: Update Ads terms language.
2015-01-29 01:24:42 +00:00
Dirk Dougherty
1cbe026b93 am 820d5c52: am 8b1ad8e4: am 49738792: Doc change: Update Ads terms language. automerge: 3f9d57d automerge: e0b5a38
* commit '820d5c52b7e65bffeb4291887f5a1011e7ce971e':
  Doc change: Update Ads terms language.
2015-01-29 01:11:14 +00:00
Dirk Dougherty
e0b5a38122 am 8b1ad8e4: am 49738792: Doc change: Update Ads terms language.
automerge: 3f9d57d

* commit '3f9d57dbe896d56e0eae381aa3e70ac93d755f24':
  Doc change: Update Ads terms language.
2015-01-29 00:54:45 +00:00
Dirk Dougherty
497387928d Doc change: Update Ads terms language.
Change-Id: I57cf037229f966f52c20c05f6ac29cc6774b1643
2015-01-29 00:16:25 +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
Ricardo Cervera
d05d91358d am 8ff85c5e: am be3731f0: am f5386a9a: am 8ec3eb4e: am de113066: docs: Transitions training class.
automerge: 3c6cd62

* commit '3c6cd6273ce89598c10cc15aa2843a7f8301ff27':
  docs: Transitions training class.
2015-01-27 23:44:52 +00:00
Joe Fernandez
05defb992e Merge "docs: plugin for gradle typo" into lmp-docs 2015-01-27 22:57:30 +00:00
Ricardo Cervera
3c6cd6273c am 8ff85c5e: am be3731f0: am f5386a9a: am 8ec3eb4e: am de113066: docs: Transitions training class.
* commit '8ff85c5ecb09f297d8926bae5ad09f0423594ed0':
  docs: Transitions training class.
2015-01-27 21:43:26 +00:00
Ricardo Cervera
be3731f028 am f5386a9a: am 8ec3eb4e: am de113066: docs: Transitions training class.
* commit 'f5386a9a949297be1321cce7eed5d0975c7b64ad':
  docs: Transitions training class.
2015-01-27 21:28:14 +00:00
Ricardo Cervera
de113066d8 docs: Transitions training class.
Change-Id: Ib41b42a890c44fdc001242bc356442ef9201b591
2015-01-27 11:35:20 -08:00
Sarah Maddox
5b53481a86 am 83f40802: am 95226c98: am 912cacde: Merge "docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API." into lmp-docs automerge: f31eb13 automerge: 1c10480
automerge: 77a7fea

* commit '77a7feac6c8832f8162d2339925a12434186eac2':
  docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API.
2015-01-26 21:54:35 +00:00
Sarah Maddox
77a7feac6c am 83f40802: am 95226c98: am 912cacde: Merge "docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API." into lmp-docs automerge: f31eb13
automerge: 1c10480

* commit '1c104802f9295afa565e0d62edac5f26b21b9916':
  docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API.
2015-01-26 20:42:57 +00:00
Sarah Maddox
f31eb13b8e am 83f40802: am 95226c98: am 912cacde: Merge "docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API." into lmp-docs
* commit '83f40802148e922d78222ffc56377534b8ee92be':
  docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API.
2015-01-26 20:35:06 +00:00
Sarah Maddox
912cacde86 Merge "docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API." into lmp-docs 2015-01-26 20:16:37 +00:00
Ricardo Cervera
e20b9941ae am ba70d548: am 9c9dc80a: am df07000e: am d064ce7e: am edb7a442: Merge "docs: Wear DataItem listener improvements" into lmp-docs
automerge: 16325bd

* commit '16325bda7f8afd70a2a1c8444fcc578f451fa00c':
  docs: Wear DataItem listener improvements
2015-01-26 20:07:14 +00:00
Ricardo Cervera
16325bda7f am ba70d548: am 9c9dc80a: am df07000e: am d064ce7e: am edb7a442: Merge "docs: Wear DataItem listener improvements" into lmp-docs
* commit 'ba70d548cb3fa700e5d11c4afae7d0e9a5f45bd9':
  docs: Wear DataItem listener improvements
2015-01-26 20:04:03 +00:00
Rich Slogar
c3e0107ce3 docs: studio proxy setup
Change-Id: Ifbe3f03a47cfb1a59ade4e2fb678a51a7256fdb4
2015-01-26 11:59:30 -08:00
Ricardo Cervera
9c9dc80a08 am df07000e: am d064ce7e: am edb7a442: Merge "docs: Wear DataItem listener improvements" into lmp-docs
* commit 'df07000e356dee84de9f4dcdd22a15e26e32f684':
  docs: Wear DataItem listener improvements
2015-01-26 19:51:53 +00:00
Ricardo Cervera
edb7a4420b Merge "docs: Wear DataItem listener improvements" into lmp-docs 2015-01-26 19:32:13 +00:00
Sarah Maddox
ed91b0dd7e docs: Adds new geocoding sample to Location API training.
Uses GoogleApiClient to connect to Play services.
Uses the latest Fused Location Provider API.

Bug: 17109822
Change-Id: I96dbf348e9ae41dbbeb075e6540620afc304d3b6
2015-01-26 11:06:55 -08: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
Ricardo Cervera
6fc90d5948 am 0f400778: am 02d093ca: am bdfcd56e: Merge "docs: Fixes to the watch faces design guidelines" into lmp-docs automerge: 65ab86c automerge: 4386d85
automerge: 9331dcb

* commit '9331dcb962e4ad90c98362c811b0f37d7a1c6c82':
  docs: Fixes to the watch faces design guidelines
2015-01-22 18:45:44 +00:00
Ricardo Cervera
9331dcb962 am 0f400778: am 02d093ca: am bdfcd56e: Merge "docs: Fixes to the watch faces design guidelines" into lmp-docs automerge: 65ab86c automerge: 4386d85
* commit '0f400778714f0357672651868146be73431d0b98':
  docs: Fixes to the watch faces design guidelines
2015-01-22 18:39:26 +00:00
Ricardo Cervera
4386d856a8 am 02d093ca: am bdfcd56e: Merge "docs: Fixes to the watch faces design guidelines" into lmp-docs
automerge: 65ab86c

* commit '65ab86cf1ad414612ac57e14f581e0ffb1819e14':
  docs: Fixes to the watch faces design guidelines
2015-01-22 18:27:57 +00:00
Luan Nguyen
0829cf2b9a am 2700393c: am edb9ba54: am 1dd76ea2: docs: Fix companion configuration (18864041) Fix declaration of var and incorrect method call (18617393) automerge: 6117147 automerge: 563e767
automerge: 2bffc5e

* commit '2bffc5e7bf2a86024d715716a6fd44def4b5f81c':
  docs: Fix companion configuration (18864041) Fix declaration of var and incorrect method call (18617393)
2015-01-22 18:09:02 +00:00
Luan Nguyen
2bffc5e7bf am 2700393c: am edb9ba54: am 1dd76ea2: docs: Fix companion configuration (18864041) Fix declaration of var and incorrect method call (18617393) automerge: 6117147 automerge: 563e767
* commit '2700393c029baf9443622440f5ebad5073429075':
  docs: Fix companion configuration (18864041) Fix declaration of var and incorrect method call (18617393)
2015-01-22 17:57:01 +00:00
Ricardo Cervera
bdfcd56e7f Merge "docs: Fixes to the watch faces design guidelines" into lmp-docs 2015-01-22 17:50:48 +00:00
Ricardo Cervera
4bfde48739 docs: Fixes to the watch faces design guidelines
Bug: 19001253

Change-Id: I356b887de71710afa27acc7544d0efdc3a857e91
2015-01-22 09:46:43 -08:00
Luan Nguyen
563e767a51 am edb9ba54: am 1dd76ea2: docs: Fix companion configuration (18864041) Fix declaration of var and incorrect method call (18617393)
automerge: 6117147

* commit '61171477918ea55c70c706f062019f5cd2194043':
  docs: Fix companion configuration (18864041) Fix declaration of var and incorrect method call (18617393)
2015-01-22 17:44:45 +00:00
Luan Nguyen
1dd76ea276 docs: Fix companion configuration (18864041)
Fix declaration of var and incorrect method call (18617393)

bug: 18864041
bug: 18617393
Change-Id: Ic31e44acfe7338f56acdbbd97ba8cc1e87042b53
2015-01-22 08:15:57 -08:00
Andrew Solovay
b94f2ce07e am ea4c21ea: am a1838a9d: am 78f4342f: Merge "docs: WebView security notes for apps on pre-K devices" into lmp-docs automerge: e628954 automerge: d4cf09d automerge: 63e822d
* commit 'ea4c21ea283bdb98b80140c697b27bb9eb2bb643':
  docs: WebView security notes for apps on pre-K devices
2015-01-22 00:03:31 +00:00
Luan Nguyen
a36fb351f8 am 2c27edc0: am 349e3b5a: am f082f898: Merge "docs: Fix conditional in ambient mode check method (18832168). Fix issue with non existent variable (18832287). Fix issue with outdated instructions (18832293). Fix issue with misleading time tick (18832171)." into lmp-doc
* commit '2c27edc0e043cb8fefa5eb1f5424f46d88712304':
  docs: Fix conditional in ambient mode check method (18832168). Fix issue with non existent variable (18832287). Fix issue with outdated instructions (18832293). Fix issue with misleading time tick (18832171).
2015-01-22 00:03:28 +00:00
Andrew Solovay
ea4c21ea28 am a1838a9d: am 78f4342f: Merge "docs: WebView security notes for apps on pre-K devices" into lmp-docs automerge: e628954 automerge: d4cf09d automerge: 63e822d
* commit 'a1838a9d78eeadc0e578e250b9ff71b1f720148e':
  docs: WebView security notes for apps on pre-K devices
2015-01-21 23:46:27 +00:00
Luan Nguyen
2c27edc0e0 am 349e3b5a: am f082f898: Merge "docs: Fix conditional in ambient mode check method (18832168). Fix issue with non existent variable (18832287). Fix issue with outdated instructions (18832293). Fix issue with misleading time tick (18832171)." into lmp-docs automerge:
* commit '349e3b5ad1e3d2f55fadce05a3726f27c8a2b5d5':
  docs: Fix conditional in ambient mode check method (18832168). Fix issue with non existent variable (18832287). Fix issue with outdated instructions (18832293). Fix issue with misleading time tick (18832171).
2015-01-21 23:46:20 +00:00
Rich Slogar
d7ffcad49b docs: linux requirements update
b/18371514

Change-Id: I8e320b53bca248d37bff22e4313041d0c138779f
2015-01-21 15:36:02 -08:00
Andrew Solovay
63e822df58 am 78f4342f: Merge "docs: WebView security notes for apps on pre-K devices" into lmp-docs automerge: e628954
automerge: d4cf09d

* commit 'd4cf09d3a0f90d61386eb1713ef2ed4ade00c061':
  docs: WebView security notes for apps on pre-K devices
2015-01-21 23:33:10 +00:00
Luan Nguyen
2b01cfbefc am f082f898: Merge "docs: Fix conditional in ambient mode check method (18832168). Fix issue with non existent variable (18832287). Fix issue with outdated instructions (18832293). Fix issue with misleading time tick (18832171)." into lmp-docs automerge: 8884eda
automerge: de9bd40

* commit 'de9bd40e21696ceeffc67ec24e6e43975461bc60':
  docs: Fix conditional in ambient mode check method (18832168). Fix issue with non existent variable (18832287). Fix issue with outdated instructions (18832293). Fix issue with misleading time tick (18832171).
2015-01-21 23:31:44 +00:00
Rich Slogar
b01e3fa104 docs: studio emulator platform update
b/5122160

Change-Id: I82966b0e9f32dc6e6641681f7726a8a8074525ff
2015-01-21 13:52:56 -08:00
Andrew Solovay
78f4342fac Merge "docs: WebView security notes for apps on pre-K devices" into lmp-docs 2015-01-21 19:20:58 +00:00