122037 Commits

Author SHA1 Message Date
Robert Ly
af0ce935c3 fix build
Change-Id: I66278269f8f02358c6d2529ef8839eb1ea42fdc4
2014-06-27 10:13:58 -07:00
Robert Ly
939765f842 more doc fixes for notifcations and wear
Change-Id: I9f0d168a8ebafb778924919766910b79504ebf68
2014-06-27 10:07:03 -07:00
Baligh Uddin
2ceb05a6a6 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-06-26 05:47:42 +00:00
Baligh Uddin
bbf69273a7 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-06-26 08:19:24 +00:00
Baligh Uddin
9cd2410131 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-06-26 05:59:24 +00:00
Scott Main
16e5d71b6b Merge "Revert "new device family image for design, not photos"" into klp-modular-dev 2014-06-26 08:19:24 +00:00
Scott Main
8374fdbca1 Revert "new device family image for design, not photos"
This reverts commit 9a5dcb8c44a0f64b4abfd8f2bc19136c42cf1232.

Change-Id: I8bb04608b99358c7a07871cd4adf0de2143d7f3a
2014-06-26 16:10:50 +00:00
smain@google.com
9a5dcb8c44 new device family image for design, not photos
Change-Id: I94350e17c3fe26ede6233d65eda22d1bfc71f970
2014-06-26 01:08:36 -07:00
smain@google.com
152440c67a Merge "new device family image for design, not photos" into klp-modular-dev 2014-06-26 05:47:42 +00:00
smain@google.com
590ee5f935 fix build, remove briefdocs
Change-Id: I94a611f4bdc2b9c7f305727aacf2edbe63b4ece7
2014-06-26 08:31:11 -07:00
Robert Ly
c34fdb72b7 docs: add l-preview notifications
Change-Id: I76a4f4c544087bdcef07a7990d5623c4de68a75d
2014-06-26 02:31:40 -07:00
Robert Ly
edd662ff66 docs: final changes to index
Change-Id: I1a9a454937a975f2b2a36ab1132e8bb91dc4059a
2014-06-26 02:06:52 -07:00
Baligh Uddin
46e0995d96 Import translations. DO NOT MERGE
Change-Id: Ifdaf8bf6e3d65abe240f127f42cc72a3471e6c98
Auto-generated-cl: translation import
2014-06-25 09:58:07 -07:00
Baligh Uddin
d4126b5093 Import translations. DO NOT MERGE
Change-Id: Ifda8bfbd471b57afd48d6255c76216c9ee58f359
Auto-generated-cl: translation import
2014-06-25 09:50:34 -07:00
Baligh Uddin
8edfe6f058 Import translations. DO NOT MERGE
Change-Id: I12eee2c77423ff9509625173bf537dbf02d411f0
Auto-generated-cl: translation import
2014-06-25 09:49:26 -07:00
Robert Ly
6e35f209d6 Merge "docs:wear landing and training fixes" into klp-modular-dev 2014-06-25 03:38:12 +00:00
Robert Ly
7aae4d4f58 docs:wear landing and training fixes
Change-Id: Iddf2392ec4ae79850099d3127ea274a71f32d0c4
2014-06-25 00:15:03 -07:00
Ricardo Cervera
0ac4b32d58 docs: Updated Renault logo on the Auto site
Lined up the icons to fit all rows.

Change-Id: I1495629dff2851cb376fa5d4295a0b9a5e4d608c
2014-06-24 23:58:43 -07:00
Joe Fernandez
1262f85d24 Merge "Android TV Landing page, final (probably)" into klp-modular-dev 2014-06-25 03:44:18 +00:00
Robert Ly
18ec418657 fix samples page
Change-Id: I47e7976e33ddb6d3fbd010c546092a0cb858ea60
2014-06-24 21:17:45 -07:00
Joe Fernandez
5e90447fae Android TV Landing page, final (probably)
Change-Id: I6a682f6962b4b01ae637301bcabd74fa67710ee4
2014-06-24 20:54:15 -07:00
Robert Ly
fa28e8cc4b Merge "docs: index landing" into klp-modular-dev 2014-06-24 08:05:46 +00:00
Robert Ly
a460cc4033 docs: index landing
Change-Id: I370f88e85f77b700ab9d2d2ba202a1e05f23b490
2014-06-25 22:42:38 -07:00
Ricardo Cervera
a1bc384d22 docs: Added GitHub links to the samples
Change-Id: I944844d64396b0ae07e4c55118d4cd960480c5b7
2014-06-25 20:37:33 -07:00
Joe Fernandez
50cbb708b4 am c12a1444: am 52e2416c: Merge "docs: fix wear whitelist sign up language to be less confusing" into klp-docs
* commit 'c12a14442734085f2f1d7f3a38e634331537b08e':
  docs: fix wear whitelist sign up language to be less confusing
2014-06-25 22:55:14 +00:00
smain@google.com
603514adfc am 08eb76f4: (-s ours) am 12df4f9e: update wear icons on preview page
* commit '08eb76f42ed53ea3967a4559d9e60a961f9450b5':
  update wear icons on preview page
2014-06-25 22:55:13 +00:00
destradaa
72e186283f Merge branch 'klp-modular-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-modular-dev 2014-06-25 22:55:07 +00:00
Joe Fernandez
c12a144427 am 52e2416c: Merge "docs: fix wear whitelist sign up language to be less confusing" into klp-docs
* commit '52e2416cc72f7d87e2f7f1aa29b7a9cb85ae0c70':
  docs: fix wear whitelist sign up language to be less confusing
2014-06-25 22:49:36 +00:00
smain@google.com
8f414479f9 fix back link for preview nav
Change-Id: I684129ba5c43d49ff52410939e8b034ccc4877ad
2014-06-25 15:19:28 -07:00
Robert Ly
017ec80fa1 am d0039968: (-s ours) am 2a139d64: Merge "docs: add gms core preview hoop-jumping" into klp-docs
* commit 'd0039968fa6caafcbb39e9613af75686a2f1ce46':
  docs: add gms core preview hoop-jumping
2014-06-25 19:29:45 +00:00
smain@google.com
d9d9d335fb am 80c07fb9: am ec6f162f: DO NOT MERGE!
* commit '80c07fb99b5a923ffd35e1b8e4cff64197074aa5':
  DO NOT MERGE!
2014-06-25 19:21:08 +00:00
smain@google.com
92fd15a31f am 5f4a2b83: (-s ours) am 53126416: DO NOT MERGE!
* commit '5f4a2b83850868fa5898661cb2555e54023060c0':
  DO NOT MERGE!
  DO NOT MERGE Revert "Revert "add 'coming soon' page for google io announcements""
2014-06-25 19:21:04 +00:00
Scott Main
62b2d414e1 am 1b4a9dbf: (-s ours) am 87670bcb: Revert "add \'coming soon\' page for google io announcements"
* commit '1b4a9dbf832870fc0ffc17212d10b34e61d4c943':
  Revert "add 'coming soon' page for google io announcements"
2014-06-25 19:12:48 +00:00
smain@google.com
7ac0aa1ea3 am bf5d1a93: (-s ours) am cca2a91a: add \'coming soon\' page for google io announcements
* commit 'bf5d1a93aa585124c110c950a2584212a7d19a6f':
  add 'coming soon' page for google io announcements
2014-06-25 19:06:23 +00:00
smain@google.com
08eb76f42e am 12df4f9e: update wear icons on preview page
* commit '12df4f9ef19b49147f700cfa95fb73517540b033':
  update wear icons on preview page
2014-06-25 18:14:11 +00:00
smain@google.com
12df4f9ef1 update wear icons on preview page
Change-Id: I17fc5a7d1ba637ea0eb557eae50aea76667e2430
2014-06-25 11:08:40 -07:00
Robert Ly
ed92996058 Merge "docs: add gcore instructions for preview" into klp-modular-dev 2014-06-25 17:34:07 +00:00
Robert Ly
a67bb26352 docs: add gcore instructions for preview
Change-Id: I51913920a00cb197682393f04ba3e7a96074202f
2014-06-25 13:02:29 -07:00
smain@google.com
8f83271963 Merge "add license wall to downloading the L Preview system images" into klp-modular-dev 2014-06-25 17:34:02 +00:00
smain@google.com
0cec476f37 add license wall to downloading the L Preview system images
Change-Id: I8c7d84bb44e05382ee73355b6f41ca2c82bf57d4
2014-06-25 14:02:26 -07:00
Joe Fernandez
54c6e0aa1f Merge "Final L-Preview Guidelines for Android TV Games Staged at http://boku.mtv.corp.google.com:9195/preview/tv/games/index.html" into klp-modular-dev 2014-06-25 17:34:07 +00:00
David Friedman
2928a3e5c4 Final L-Preview Guidelines for Android TV Games
Staged at http://boku.mtv.corp.google.com:9195/preview/tv/games/index.html

Change-Id: I87a5394a74ca62ed84ad7ad7596a1d75b77c39f2
2014-06-24 22:14:38 -07:00
Robert Ly
d0039968fa am 2a139d64: Merge "docs: add gms core preview hoop-jumping" into klp-docs
* commit '2a139d648602e6812e5366ec1abc29fa2b010c99':
  docs: add gms core preview hoop-jumping
2014-06-25 04:01:53 +00:00
Robert Ly
823ce5298f Merge "fix build" into klp-modular-dev 2014-06-25 03:44:18 +00:00
Robert Ly
925db3bc6a fix build
Change-Id: I1f5ab49236b85cd1bd46e8199e7fd6decad73064
2014-06-25 11:55:00 -07:00
Baligh Uddin
259b1fa686 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-06-25 03:44:18 +00:00
Baligh Uddin
2243f19498 Import translations. DO NOT MERGE
Change-Id: I82eb9106f42f46973f288f800f40e654d4aa0366
Auto-generated-cl: translation import
2014-06-25 09:22:24 -07:00
Baligh Uddin
61d6ef2d88 Import translations. DO NOT MERGE
Change-Id: Ie837118d09297e09f5e4f837480b6a87aa37dca5
Auto-generated-cl: translation import
2014-06-25 09:19:40 -07:00
Joe Fernandez
52e2416cc7 Merge "docs: fix wear whitelist sign up language to be less confusing" into klp-docs 2014-06-25 03:38:12 +00:00
Joe Fernandez
89722fc251 docs: fix wear whitelist sign up language to be less confusing
Change-Id: I15fcad2db2df6f8f2717e486e306246de3f96f4b
2014-06-25 15:40:48 -07:00