OSDN Git Service
Jason Monk [Mon, 23 Jun 2014 20:30:20 +0000 (16:30 -0400)]
Fix crash in starting lock task
Sometimes when coming from a dialog the current activity has changed,
which causes AM to crash and take down the framework. Instead don't
check the current activity as the user has confirmed the operation
so it is not coming from the background.
Change-Id: I0daeabcfcf814c52bcc7907a624fe6e9453c427f
Lorenzo Colitti [Thu, 26 Jun 2014 16:23:35 +0000 (16:23 +0000)]
Merge "Initial RDNSS tracking implementation."
Lorenzo Colitti [Mon, 23 Jun 2014 15:35:47 +0000 (00:35 +0900)]
Initial RDNSS tracking implementation.
Add a DnsServerRepository to NetlinkTracker that keeps track of
IPv6 DNS servers received via RDNSS. It supports expiring
existing DNS servers when their lifetimes go below zero and
keeping track of more than just the 2 or 3 DNS servers that are
currently in use, so that if they all expire DNS will continue to
work.
It does not yet expire DNS servers using timers, only when a new
update comes in.
Bug:
9180552
Change-Id: I455699076198f43570a3b0b8ec7e5967514d6086
Raph Levien [Wed, 25 Jun 2014 23:32:13 +0000 (16:32 -0700)]
Switch all text layout to Minikin
This patch switches all text layout operations to use Minikin, removes
the USE_MINIKIN #ifdef, and deletes some of the code that was only used
in the old TextLayout path (although some more refactoring remains).
Change-Id: I51b5c4e2bb46cfd9d204c12b9f16f135c769f5b5
Raph Levien [Wed, 25 Jun 2014 23:32:13 +0000 (16:32 -0700)]
Delete Paint.getTextGlyphs()
The Paint.getTextGlyphs() method was used for testing the old Arabic
shaper and is entirely obsolete. Note that this is the very last
dependency (other than some enums in the header) for the old TextLayout
code path.
Change-Id: I7b596f0c0942ed50987fc8e0478cd93e667f1f9e
Raph Levien [Thu, 26 Jun 2014 16:07:55 +0000 (16:07 +0000)]
Merge "Fix build breakage"
Raph Levien [Thu, 26 Jun 2014 16:04:54 +0000 (09:04 -0700)]
Fix build breakage
Other files were including GraphicsJNI.h and didn't have Minikin in the
include path. This patch eliminates the offending include.
Change-Id: I05c9dbf80b93f1731fd0192015e2c9c68a9dd3c6
smain@google.com [Thu, 26 Jun 2014 16:01:34 +0000 (16:01 +0000)]
am
1fff0b32: am
152440c6: Merge "new device family image for design, not photos" into klp-modular-dev
* commit '
1fff0b321c226afb056907d4accda4aec498dd2a':
new device family image for design, not photos
smain@google.com [Thu, 26 Jun 2014 16:01:28 +0000 (16:01 +0000)]
am
6988c162: am
590ee5f9: fix build, remove briefdocs
* commit '
6988c162a38802b02035f019137473e5881f2f50':
fix build, remove briefdocs
smain@google.com [Thu, 26 Jun 2014 15:55:32 +0000 (15:55 +0000)]
am
152440c6: Merge "new device family image for design, not photos" into klp-modular-dev
* commit '
152440c67acace16dc1655a821352b0d69a61562':
new device family image for design, not photos
smain@google.com [Thu, 26 Jun 2014 15:55:27 +0000 (15:55 +0000)]
am
590ee5f9: fix build, remove briefdocs
* commit '
590ee5f935139eeceec6ed75f658cb6007f82897':
fix build, remove briefdocs
smain@google.com [Thu, 26 Jun 2014 15:31:11 +0000 (08:31 -0700)]
fix build, remove briefdocs
Change-Id: I94a611f4bdc2b9c7f305727aacf2edbe63b4ece7
Robert Ly [Thu, 26 Jun 2014 09:50:29 +0000 (09:50 +0000)]
am
c34fdb72: docs: add l-preview notifications
* commit '
c34fdb72b70eea142dea4cb75f3a6cc16e70270b':
docs: add l-preview notifications
Robert Ly [Thu, 26 Jun 2014 09:50:25 +0000 (09:50 +0000)]
am
edd662ff: docs: final changes to index
* commit '
edd662ff667a404969b9f892bdb10ceaa5e2db25':
docs: final changes to index
Robert Ly [Thu, 26 Jun 2014 09:50:19 +0000 (09:50 +0000)]
am
fa28e8cc: Merge "docs: index landing" into klp-modular-dev
* commit '
fa28e8cc4baa4acc9e6cd3bfc5276b67cd8e86f0':
docs: index landing
Robert Ly [Thu, 26 Jun 2014 09:50:15 +0000 (09:50 +0000)]
am
c24e1813: Merge "docs: Added links and release notes for ADT 23, Studio 0.8, SDK Tools" into klp-modular-dev
* commit '
c24e18134ee1155d6ec35837644d940f93039370':
docs: Added links and release notes for ADT 23, Studio 0.8, SDK Tools
smain@google.com [Thu, 26 Jun 2014 09:49:58 +0000 (09:49 +0000)]
am
dfb41027: lots of updates to the wear design guide actually decent layout with images
* commit '
dfb4102718dcb87acdf4015dc44ab578f57e945f':
lots of updates to the wear design guide actually decent layout with images
Robert Ly [Thu, 26 Jun 2014 09:17:12 +0000 (02:17 -0700)]
docs: add l-preview notifications
Change-Id: I76a4f4c544087bdcef07a7990d5623c4de68a75d
Robert Ly [Thu, 26 Jun 2014 08:18:05 +0000 (01:18 -0700)]
docs: final changes to index
Change-Id: I1a9a454937a975f2b2a36ab1132e8bb91dc4059a
smain@google.com [Thu, 26 Jun 2014 15:51:37 +0000 (15:51 +0000)]
Merge "new device family image for design, not photos" into klp-modular-dev
smain@google.com [Thu, 26 Jun 2014 08:03:55 +0000 (01:03 -0700)]
new device family image for design, not photos
Change-Id: I94350e17c3fe26ede6233d65eda22d1bfc71f970
smain@google.com [Tue, 24 Jun 2014 21:12:45 +0000 (14:12 -0700)]
lots of updates to the wear design guide
actually decent layout with images
Change-Id: I45047158b61d3d8202b0f77e1ff8aea9c57da7c5
Ricardo Cervera [Thu, 26 Jun 2014 03:57:44 +0000 (03:57 +0000)]
am
a1bc384d: docs: Added GitHub links to the samples
* commit '
a1bc384d22de86fc5d8fac90328fa619a6a3fceb':
docs: Added GitHub links to the samples
Ricardo Cervera [Thu, 26 Jun 2014 00:14:03 +0000 (17:14 -0700)]
docs: Added GitHub links to the samples
Change-Id: I944844d64396b0ae07e4c55118d4cd960480c5b7
Jason Sams [Thu, 26 Jun 2014 00:25:28 +0000 (00:25 +0000)]
am
89e4c715: am
7165bd6d: Merge "Add check and throw for failed Intrinsic init."
* commit '
89e4c715e01f4a2da31a92788547282d699752bf':
Add check and throw for failed Intrinsic init.
Jason Sams [Thu, 26 Jun 2014 00:20:26 +0000 (00:20 +0000)]
am
7165bd6d: Merge "Add check and throw for failed Intrinsic init."
* commit '
7165bd6d7496159b426f072bdf13adfffc917a24':
Add check and throw for failed Intrinsic init.
Joe Fernandez [Wed, 25 Jun 2014 23:00:33 +0000 (23:00 +0000)]
am
50cbb708: am
c12a1444: am
52e2416c: Merge "docs: fix wear whitelist sign up language to be less confusing" into klp-docs
* commit '
50cbb708b4e6a99b92a646fd548058f1ff4e766c':
docs: fix wear whitelist sign up language to be less confusing
smain@google.com [Wed, 25 Jun 2014 23:00:30 +0000 (23:00 +0000)]
am
603514ad: am
08eb76f4: (-s ours) am
12df4f9e: update wear icons on preview page
* commit '
603514adfc2582e194cf6aed112fd5eab40c529d':
update wear icons on preview page
destradaa [Wed, 25 Jun 2014 23:00:27 +0000 (23:00 +0000)]
am
72e18628: Merge branch \'klp-modular-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-modular-dev
* commit '
72e186283fdef7f6ac56409bf52a5748f6a4749c':
Robert Ly [Wed, 25 Jun 2014 23:00:16 +0000 (23:00 +0000)]
am
017ec80f: am
d0039968: (-s ours) am
2a139d64: Merge "docs: add gms core preview hoop-jumping" into klp-docs
* commit '
017ec80fa1ca1212f9c98dcdbb07d1f0bab938d5':
docs: add gms core preview hoop-jumping
Joe Fernandez [Wed, 25 Jun 2014 22:55:14 +0000 (22:55 +0000)]
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
smain@google.com [Wed, 25 Jun 2014 22:55:13 +0000 (22:55 +0000)]
am
08eb76f4: (-s ours) am
12df4f9e: update wear icons on preview page
* commit '
08eb76f42ed53ea3967a4559d9e60a961f9450b5':
update wear icons on preview page
destradaa [Wed, 25 Jun 2014 22:55:07 +0000 (22:55 +0000)]
Merge branch 'klp-modular-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-modular-dev
Joe Fernandez [Wed, 25 Jun 2014 22:49:36 +0000 (22:49 +0000)]
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
smain@google.com [Wed, 25 Jun 2014 22:32:26 +0000 (22:32 +0000)]
am
8f414479: fix back link for preview nav
* commit '
8f414479f91f73c3b8432ca93991ba643b9c846f':
fix back link for preview nav
smain@google.com [Wed, 25 Jun 2014 22:11:40 +0000 (15:11 -0700)]
fix back link for preview nav
Change-Id: I684129ba5c43d49ff52410939e8b034ccc4877ad
Robert Ly [Wed, 25 Jun 2014 21:38:49 +0000 (21:38 +0000)]
am
ed929960: Merge "docs: add gcore instructions for preview" into klp-modular-dev
* commit '
ed929960584cba38a81b49cff597dba59d50a0a7':
docs: add gcore instructions for preview
smain@google.com [Wed, 25 Jun 2014 21:28:15 +0000 (21:28 +0000)]
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
Joe Fernandez [Wed, 25 Jun 2014 20:53:54 +0000 (20:53 +0000)]
am
54c6e0aa: Merge "Final L-Preview Guidelines for Android TV Games Staged at 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
Stephen Hines [Wed, 25 Jun 2014 20:50:26 +0000 (20:50 +0000)]
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.
Stephen Hines [Wed, 25 Jun 2014 20:44:09 +0000 (20:44 +0000)]
am
924ed1fa: Merge "Switch from size_t -> uint32_t for dimensions array."
* commit '
924ed1fae19ba70b5c6267b977ae8c72b63fe99a':
Switch from size_t -> uint32_t for dimensions array.
Robert Ly [Wed, 25 Jun 2014 19:29:45 +0000 (19:29 +0000)]
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
smain@google.com [Wed, 25 Jun 2014 19:25:30 +0000 (19:25 +0000)]
smain@google.com [Wed, 25 Jun 2014 19:25:26 +0000 (19:25 +0000)]
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""
Scott Main [Wed, 25 Jun 2014 19:25:22 +0000 (19:25 +0000)]
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"
smain@google.com [Wed, 25 Jun 2014 19:25:18 +0000 (19:25 +0000)]
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
smain@google.com [Wed, 25 Jun 2014 19:21:08 +0000 (19:21 +0000)]
smain@google.com [Wed, 25 Jun 2014 19:21:04 +0000 (19:21 +0000)]
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""
Scott Main [Wed, 25 Jun 2014 19:12:48 +0000 (19:12 +0000)]
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"
Robert Ly [Wed, 25 Jun 2014 19:12:46 +0000 (19:12 +0000)]
am
823ce529: Merge "fix build" into klp-modular-dev
* commit '
823ce5298fec4d0d9f5773ce16af882e633f1f16':
fix build
Baligh Uddin [Wed, 25 Jun 2014 19:12:41 +0000 (19:12 +0000)]
am
259b1fa6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
259b1fa686dccdc4924aa3140d07865df85325db':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 25 Jun 2014 19:12:37 +0000 (19:12 +0000)]
am
2243f194: (-s ours) Import translations. DO NOT MERGE
* commit '
2243f19498bdccec4a35f35913582576cc52439d':
Import translations. DO NOT MERGE
Robert Ly [Wed, 25 Jun 2014 19:12:19 +0000 (19:12 +0000)]
am
6e35f209: Merge "docs:wear landing and training fixes" into klp-modular-dev
* commit '
6e35f209d62eb814383ae22e96384a55b5e3387e':
docs:wear landing and training fixes
Ricardo Cervera [Wed, 25 Jun 2014 19:12:15 +0000 (19:12 +0000)]
am
0ac4b32d: docs: Updated Renault logo on the Auto site
* commit '
0ac4b32d58e411244dbea77e02950b569b7ecd69':
docs: Updated Renault logo on the Auto site
Joe Fernandez [Wed, 25 Jun 2014 19:12:10 +0000 (19:12 +0000)]
am
1262f85d: Merge "Android TV Landing page, final (probably)" into klp-modular-dev
* commit '
1262f85d24e03df0ed8cf8b0fa141888ed6da609':
Android TV Landing page, final (probably)
Robert Ly [Wed, 25 Jun 2014 19:12:07 +0000 (19:12 +0000)]
am
18ec4186: fix samples page
* commit '
18ec418657bd09b2587ded808a2660b3a5e1aefd':
fix samples page
Robert Ly [Wed, 25 Jun 2014 19:12:01 +0000 (19:12 +0000)]
am
e1beb730: Merge "docs: wear training classes" into klp-modular-dev
* commit '
e1beb730c32348d2a7f194a566eef6e5ed541b3b':
docs: wear training classes
Robert Ly [Wed, 25 Jun 2014 19:11:57 +0000 (19:11 +0000)]
am
8c51ee84: Merge "docs: add gms core hoop jumping" into klp-modular-dev
* commit '
8c51ee840916a8c0cd1598e1681f7f83141ea829':
docs: add gms core hoop jumping
Joe Fernandez [Wed, 25 Jun 2014 19:11:52 +0000 (19:11 +0000)]
am
4c4f8b32: Merge "docs: Fixes for Android TV Dev Guide" into klp-modular-dev
* commit '
4c4f8b32a0b492ca804f19eadc2143b146836027':
docs: Fixes for Android TV Dev Guide
smain@google.com [Wed, 25 Jun 2014 19:06:23 +0000 (19:06 +0000)]
am
bf5d1a93: (-s ours) am
cca2a91a: add \'coming soon\' page for google io announcements
* commit '
bf5d1a93aa585124c110c950a2584212a7d19a6f':
add 'coming soon' page for google io announcements
smain@google.com [Wed, 25 Jun 2014 18:14:11 +0000 (18:14 +0000)]
am
12df4f9e: update wear icons on preview page
* commit '
12df4f9ef19b49147f700cfa95fb73517540b033':
update wear icons on preview page
smain@google.com [Wed, 25 Jun 2014 18:07:05 +0000 (11:07 -0700)]
update wear icons on preview page
Change-Id: I17fc5a7d1ba637ea0eb557eae50aea76667e2430
Jason Sams [Thu, 26 Jun 2014 00:13:17 +0000 (00:13 +0000)]
Merge "Add check and throw for failed Intrinsic init."
Robert Ly [Wed, 25 Jun 2014 21:34:58 +0000 (21:34 +0000)]
Merge "docs: add gcore instructions for preview" into klp-modular-dev
Robert Ly [Wed, 25 Jun 2014 17:56:07 +0000 (10:56 -0700)]
docs: add gcore instructions for preview
Change-Id: I51913920a00cb197682393f04ba3e7a96074202f
Joe Fernandez [Wed, 25 Jun 2014 20:47:04 +0000 (20:47 +0000)]
Merge "Final L-Preview Guidelines for Android TV Games Staged at boku.mtv.corp.google.com:9195/preview/tv/games/index.html" into klp-modular-dev
smain@google.com [Wed, 25 Jun 2014 21:21:30 +0000 (21:21 +0000)]
Merge "add license wall to downloading the L Preview system images" into klp-modular-dev
smain@google.com [Wed, 25 Jun 2014 21:02:26 +0000 (14:02 -0700)]
add license wall to downloading the L Preview system images
Change-Id: I8c7d84bb44e05382ee73355b6f41ca2c82bf57d4
Baligh Uddin [Wed, 25 Jun 2014 16:22:24 +0000 (09:22 -0700)]
Import translations. DO NOT MERGE
Change-Id: I82eb9106f42f46973f288f800f40e654d4aa0366
Auto-generated-cl: translation import
Ricardo Cervera [Wed, 25 Jun 2014 06:36:14 +0000 (23:36 -0700)]
docs: Updated Renault logo on the Auto site
Lined up the icons to fit all rows.
Change-Id: I1495629dff2851cb376fa5d4295a0b9a5e4d608c
David Friedman [Wed, 25 Jun 2014 01:37:09 +0000 (18:37 -0700)]
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
Robert Ly [Wed, 25 Jun 2014 04:17:45 +0000 (21:17 -0700)]
fix samples page
Change-Id: I47e7976e33ddb6d3fbd010c546092a0cb858ea60
Robert Ly [Wed, 25 Jun 2014 04:01:53 +0000 (04:01 +0000)]
am
2a139d64: Merge "docs: add gms core preview hoop-jumping" into klp-docs
* commit '
2a139d648602e6812e5366ec1abc29fa2b010c99':
docs: add gms core preview hoop-jumping
Robert Ly [Wed, 25 Jun 2014 18:57:23 +0000 (18:57 +0000)]
Merge "fix build" into klp-modular-dev
Robert Ly [Wed, 25 Jun 2014 18:55:00 +0000 (11:55 -0700)]
fix build
Change-Id: I1f5ab49236b85cd1bd46e8199e7fd6decad73064
Baligh Uddin [Wed, 25 Jun 2014 16:31:40 +0000 (16:31 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Wed, 25 Jun 2014 16:19:40 +0000 (09:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie837118d09297e09f5e4f837480b6a87aa37dca5
Auto-generated-cl: translation import
Joe Fernandez [Wed, 25 Jun 2014 04:37:27 +0000 (04:37 +0000)]
Merge "Android TV Landing page, final (probably)" into klp-modular-dev
Joe Fernandez [Wed, 18 Jun 2014 17:48:45 +0000 (10:48 -0700)]
Android TV Landing page, final (probably)
Change-Id: I6a682f6962b4b01ae637301bcabd74fa67710ee4
Joe Fernandez [Wed, 25 Jun 2014 22:45:23 +0000 (22:45 +0000)]
Merge "docs: fix wear whitelist sign up language to be less confusing" into klp-docs
Joe Fernandez [Wed, 25 Jun 2014 22:40:48 +0000 (15:40 -0700)]
docs: fix wear whitelist sign up language to be less confusing
Change-Id: I15fcad2db2df6f8f2717e486e306246de3f96f4b
Robert Ly [Wed, 25 Jun 2014 07:17:13 +0000 (07:17 +0000)]
Merge "docs:wear landing and training fixes" into klp-modular-dev
Robert Ly [Wed, 25 Jun 2014 06:00:41 +0000 (23:00 -0700)]
docs:wear landing and training fixes
Change-Id: Iddf2392ec4ae79850099d3127ea274a71f32d0c4
Robert Ly [Wed, 25 Jun 2014 03:57:34 +0000 (03:57 +0000)]
Merge "docs: add gms core preview hoop-jumping" into klp-docs
smain@google.com [Wed, 25 Jun 2014 02:06:47 +0000 (02:06 +0000)]
smain@google.com [Wed, 25 Jun 2014 02:06:43 +0000 (02:06 +0000)]
smain@google.com [Tue, 24 Jun 2014 19:35:31 +0000 (12:35 -0700)]
DO NOT MERGE!
add image to GP education collection card
Change-Id: Ie21813f84277ee8f882efc1a8589080476a4bf66
(cherry picked from commit
f4787f4dce96bef3de95d36ce400691c72df3d7e)
smain@google.com [Wed, 18 Jun 2014 23:13:56 +0000 (16:13 -0700)]
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)
Robert Ly [Wed, 25 Jun 2014 01:10:33 +0000 (18:10 -0700)]
docs: add gms core preview hoop-jumping
Change-Id: Ic9602c0f3a309bd37dc5f628f4316b0124f0c8b3
Robert Ly [Wed, 25 Jun 2014 01:33:52 +0000 (01:33 +0000)]
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.
Ricardo Cervera [Wed, 25 Jun 2014 01:13:31 +0000 (01:13 +0000)]
am
8b938c54: docs: Removing mercedes logo from auto site
* commit '
8b938c5418f4f15f0f70553a31b95078c255caec':
docs: Removing mercedes logo from auto site
Scott Main [Wed, 25 Jun 2014 01:02:00 +0000 (01:02 +0000)]
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""
Scott Main [Wed, 25 Jun 2014 01:01:57 +0000 (01:01 +0000)]
am
87670bcb: Revert "add \'coming soon\' page for google io announcements"
* commit '
87670bcb34c308731bbec177dae99cd9981656fb':
Revert "add 'coming soon' page for google io announcements"
smain@google.com [Wed, 25 Jun 2014 01:01:54 +0000 (01:01 +0000)]
am
cca2a91a: add \'coming soon\' page for google io announcements
* commit '
cca2a91a7cba2f0005b9d4a9a21a506ed191c348':
add 'coming soon' page for google io announcements
Scott Main [Wed, 25 Jun 2014 00:58:45 +0000 (00:58 +0000)]
DO NOT MERGE
Revert "Revert "add 'coming soon' page for google io announcements""
This reverts commit
87670bcb34c308731bbec177dae99cd9981656fb.
Change-Id: Ica55fdc9f345c55ab038ecbf836673be4f4bb1a0
Scott Main [Wed, 25 Jun 2014 00:57:48 +0000 (00:57 +0000)]
Revert "add 'coming soon' page for google io announcements"
This reverts commit
cca2a91a7cba2f0005b9d4a9a21a506ed191c348.
Change-Id: I0212a0f0dbe63c14d796c9e764c0871790fddc46
smain@google.com [Wed, 25 Jun 2014 00:47:30 +0000 (17:47 -0700)]
add 'coming soon' page for google io announcements
Change-Id: I17e09aaa3c93060b306301ffa5012d8fcee3af22
Ricardo Cervera [Wed, 25 Jun 2014 00:53:53 +0000 (17:53 -0700)]
docs: Removing mercedes logo from auto site
Change-Id: I155a76982858e038bdccaab7a6e0f368da82d362
Joe Fernandez [Wed, 25 Jun 2014 00:38:58 +0000 (00:38 +0000)]
am
e748fb58: Merge "Android TV Design Guidelines" into klp-modular-dev
* commit '
e748fb5891bac5bb6ae01a0d2550ab70a7ad9a81':
Android TV Design Guidelines
Quddus Chong [Wed, 25 Jun 2014 00:38:54 +0000 (00:38 +0000)]
am
f9a4666b: Merge "docs: Updated L Preview Highlights (hopefully final)." into klp-modular-dev
* commit '
f9a4666ba8f8d67ee9389502bfd8cb636f80f986':
docs: Updated L Preview Highlights (hopefully final).
OSDN Git Service
