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

124342 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
smain@google.com
a16f0958fc am 8f832719: Merge "add license wall to downloading the L Preview system images" into klp-modular-dev 
* commit '8f832719632cdbcbcc555c94f898ddbf38174de9':
  add license wall to downloading the L Preview system images
 2014-06-25 21:28:15 +00:00
Joe Fernandez
02ea12eabf am 54c6e0aa: 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 
* commit '54c6e0aa1f27e5ecf3db64710563a305d78e9d39':
  Final L-Preview Guidelines for Android TV Games Staged at http://boku.mtv.corp.google.com:9195/preview/tv/games/index.html
 2014-06-25 20:53:54 +00:00
Stephen Hines
af97f87a47 am 6d38cec1: am 924ed1fa: Merge "Switch from size_t -> uint32_t for dimensions array." 
* commit '6d38cec12baa98fc50abd033eddd359a66843efa':
  Switch from size_t -> uint32_t for dimensions array.
 2014-06-25 20:50:26 +00:00
Stephen Hines
6d38cec12b am 924ed1fa: Merge "Switch from size_t -> uint32_t for dimensions array." 
* commit '924ed1fae19ba70b5c6267b977ae8c72b63fe99a':
  Switch from size_t -> uint32_t for dimensions array.
 2014-06-25 20:44:09 +00:00
smain@google.com
3edaf370e3 am d9d9d335: am 80c07fb9: am ec6f162f: DO NOT MERGE! 
* commit 'd9d9d335fbd88d77ad10f5850e824c72c85bcfb0':
  DO NOT MERGE!
 2014-06-25 19:25:30 +00:00
smain@google.com
d01b9d7c47 am 92fd15a3: am 5f4a2b83: (-s ours) am 53126416: DO NOT MERGE! 
* commit '92fd15a31f54a76900c2fc27d19ef5313eeeec6f':
  DO NOT MERGE!
  DO NOT MERGE Revert "Revert "add 'coming soon' page for google io announcements""
 2014-06-25 19:25:26 +00:00
Scott Main
31e3f69e04 am 62b2d414: am 1b4a9dbf: (-s ours) am 87670bcb: Revert "add \'coming soon\' page for google io announcements" 
* commit '62b2d414e194b41fc1a745b98cb6e608ec22c523':
  Revert "add 'coming soon' page for google io announcements"
 2014-06-25 19:25:22 +00:00
smain@google.com
83985711ad am 7ac0aa1e: am bf5d1a93: (-s ours) am cca2a91a: add \'coming soon\' page for google io announcements 
* commit '7ac0aa1ea3b282b375a8fedd572f30145299b10a':
  add 'coming soon' page for google io announcements
 2014-06-25 19:25:18 +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
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
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
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
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
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
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
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
smain@google.com
bf5d1a93aa am cca2a91a: add \'coming soon\' page for google io announcements 
* commit 'cca2a91a7cba2f0005b9d4a9a21a506ed191c348':
  add 'coming soon' page for google io announcements
 2014-06-25 01:01:54 +00:00
Scott Main
4aa9c6d5d3 DO NOT MERGE 
Revert "Revert "add 'coming soon' page for google io announcements""

This reverts commit 87670bcb34c308731bbec177dae99cd9981656fb.

Change-Id: Ica55fdc9f345c55ab038ecbf836673be4f4bb1a0
 2014-06-25 00:58:45 +00:00
Scott Main
87670bcb34 Revert "add 'coming soon' page for google io announcements" 
This reverts commit cca2a91a7cba2f0005b9d4a9a21a506ed191c348.

Change-Id: I0212a0f0dbe63c14d796c9e764c0871790fddc46
 2014-06-25 00:57:48 +00:00
smain@google.com
cca2a91a7c add 'coming soon' page for google io announcements 
Change-Id: I17e09aaa3c93060b306301ffa5012d8fcee3af22
 2014-06-24 17:54:28 -07:00
Ricardo Cervera
8b938c5418 docs: Removing mercedes logo from auto site 
Change-Id: I155a76982858e038bdccaab7a6e0f368da82d362
 2014-06-24 17:53:53 -07:00