drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
124,452 Commits 1 Branch 0 Tags
Commit Graph

124452 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Robert Ly
1e1ca756a9 am 823ce529: Merge "fix build" into klp-modular-dev 
* commit '823ce5298fec4d0d9f5773ce16af882e633f1f16':
  fix build
 2014-06-25 19:12:46 +00:00
Baligh Uddin
29004a82a0 am 259b1fa6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '259b1fa686dccdc4924aa3140d07865df85325db':
  Import translations. DO NOT MERGE
 2014-06-25 19:12:41 +00:00
Baligh Uddin
55567819af am 2243f194: (-s ours) Import translations. DO NOT MERGE 
* commit '2243f19498bdccec4a35f35913582576cc52439d':
  Import translations. DO NOT MERGE
 2014-06-25 19:12:37 +00:00
Robert Ly
161ca5d261 am 6e35f209: Merge "docs:wear landing and training fixes" into klp-modular-dev 
* commit '6e35f209d62eb814383ae22e96384a55b5e3387e':
  docs:wear landing and training fixes
 2014-06-25 19:12:19 +00:00
Ricardo Cervera
ce6fe5b7c9 am 0ac4b32d: docs: Updated Renault logo on the Auto site 
* commit '0ac4b32d58e411244dbea77e02950b569b7ecd69':
  docs: Updated Renault logo on the Auto site
 2014-06-25 19:12:15 +00:00
Joe Fernandez
425d710852 am 1262f85d: Merge "Android TV Landing page, final (probably)" into klp-modular-dev 
* commit '1262f85d24e03df0ed8cf8b0fa141888ed6da609':
  Android TV Landing page, final (probably)
 2014-06-25 19:12:10 +00:00
Robert Ly
992112f672 am 18ec4186: fix samples page 
* commit '18ec418657bd09b2587ded808a2660b3a5e1aefd':
  fix samples page
 2014-06-25 19:12:07 +00:00
Robert Ly
3f737f2cae am e1beb730: Merge "docs: wear training classes" into klp-modular-dev 
* commit 'e1beb730c32348d2a7f194a566eef6e5ed541b3b':
  docs: wear training classes
 2014-06-25 19:12:01 +00:00
Robert Ly
27ff7a5819 am 8c51ee84: Merge "docs: add gms core hoop jumping" into klp-modular-dev 
* commit '8c51ee840916a8c0cd1598e1681f7f83141ea829':
  docs: add gms core hoop jumping
 2014-06-25 19:11:57 +00:00
Joe Fernandez
19e4a28a44 am 4c4f8b32: Merge "docs: Fixes for Android TV Dev Guide" into klp-modular-dev 
* commit '4c4f8b32a0b492ca804f19eadc2143b146836027':
  docs: Fixes for Android TV Dev Guide
 2014-06-25 19:11:52 +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
Jason Sams
7165bd6d74 Merge "Add check and throw for failed Intrinsic init." 2014-06-25 17:35:00 +00: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
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
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
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
Baligh Uddin
2243f19498 Import translations. DO NOT MERGE 
Change-Id: I82eb9106f42f46973f288f800f40e654d4aa0366
Auto-generated-cl: translation import
 2014-06-25 09:22:24 -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
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
18ec418657 fix samples page 
Change-Id: I47e7976e33ddb6d3fbd010c546092a0cb858ea60
 2014-06-24 21:17:45 -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
61d6ef2d88 Import translations. DO NOT MERGE 
Change-Id: Ie837118d09297e09f5e4f837480b6a87aa37dca5
Auto-generated-cl: translation import
 2014-06-25 09:19:40 -07:00
Joe Fernandez
1262f85d24 Merge "Android TV Landing page, final (probably)" into klp-modular-dev 2014-06-25 03:44:18 +00:00
Joe Fernandez
5e90447fae Android TV Landing page, final (probably) 
Change-Id: I6a682f6962b4b01ae637301bcabd74fa67710ee4
 2014-06-24 20:54:15 -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
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
Robert Ly
2a139d6486 Merge "docs: add gms core preview hoop-jumping" into klp-docs 2014-06-25 03:38:12 +00:00
smain@google.com
80c07fb99b am ec6f162f: DO NOT MERGE! 
* commit 'ec6f162f0e3fc0d68c1ec0ac30ff1353bf4f1e97':
  DO NOT MERGE!
 2014-06-25 02:06:47 +00:00
smain@google.com
5f4a2b8385 am 53126416: DO NOT MERGE! 
* commit '531264164a2cd24fa412b71782ef424a2d968028':
  DO NOT MERGE!
 2014-06-25 02:06:43 +00:00
smain@google.com
ec6f162f0e DO NOT MERGE! 
add image to GP education collection card

Change-Id: Ie21813f84277ee8f882efc1a8589080476a4bf66
(cherry picked from commit f4787f4dce96bef3de95d36ce400691c72df3d7e)
 2014-06-25 02:03:36 +00:00
smain@google.com
531264164a DO NOT MERGE! 
update Edu pages for launch of Chrome edu apps on play store
removes the FAQ and Guidelines docs, redirect to devsite copy will
be implemented with separate CL

Change-Id: I006d2374b1d49fbf41ce60a39f08fe1ad96096c1
(cherry picked from commit 941f800a848a5dad4d4541a214477e95f738a5c8)
 2014-06-25 02:02:30 +00:00
Robert Ly
eab89e9505 docs: add gms core preview hoop-jumping 
Change-Id: Ic9602c0f3a309bd37dc5f628f4316b0124f0c8b3
 2014-06-24 18:54:49 -07:00
Robert Ly
59021e2a82 am d174461c: Merge "docs: Added descriptions of the l-preview samples." into klp-modular-dev 
* commit 'd174461c385ca7443631b330e7fc7ad2c66c8892':
  docs: Added descriptions of the l-preview samples.
 2014-06-25 01:33:52 +00:00
Ricardo Cervera
15f7ddfbb5 am 8b938c54: docs: Removing mercedes logo from auto site 
* commit '8b938c5418f4f15f0f70553a31b95078c255caec':
  docs: Removing mercedes logo from auto site
 2014-06-25 01:13:31 +00:00
Scott Main
48371ca146 am 4aa9c6d5: DO NOT MERGE Revert "Revert "add \'coming soon\' page for google io announcements"" 
* commit '4aa9c6d5d38a1091bda7950baba5a9199898a728':
  DO NOT MERGE Revert "Revert "add 'coming soon' page for google io announcements""
 2014-06-25 01:02:00 +00:00
Scott Main
1b4a9dbf83 am 87670bcb: Revert "add \'coming soon\' page for google io announcements" 
* commit '87670bcb34c308731bbec177dae99cd9981656fb':
  Revert "add 'coming soon' page for google io announcements"
 2014-06-25 01:01:57 +00:00