OSDN Git Service
quddusc [Tue, 10 Dec 2013 06:01:10 +0000 (06:01 +0000)]
am
ad7cf3af: Merge "docs: Added training doc for app indexing (aka Calypso)." into klp-docs
* commit '
ad7cf3afa372ba2479867c1f49aea7566564b5da':
docs: Added training doc for app indexing (aka Calypso).
quddusc [Mon, 9 Dec 2013 23:50:57 +0000 (23:50 +0000)]
Merge "docs: Added training doc for app indexing (aka Calypso)." into klp-docs
quddusc [Mon, 18 Nov 2013 23:15:07 +0000 (15:15 -0800)]
docs: Added training doc for app indexing (aka Calypso).
Change-Id: Ic71a1ab607799153c030054b3e1017942c5db91a
Baligh Uddin [Mon, 9 Dec 2013 18:05:02 +0000 (10:05 -0800)]
am
0bfbb676: (-s ours) Import translations. DO NOT MERGE
* commit '
0bfbb676277c907444b09ba9e653491b32dddf9c':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 9 Dec 2013 17:53:12 +0000 (09:53 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iaac5bb8f0ee9e7471e6f6401eab46a86a406ce4c
Auto-generated-cl: translation import
Scott Main [Sat, 7 Dec 2013 01:45:31 +0000 (01:45 +0000)]
am
9cefb571: Merge "Revert "add Drive API feature page. fix link text on several pages"" into klp-docs
* commit '
9cefb57116653346729a9fc606e8ff4f899ad380':
Revert "add Drive API feature page. fix link text on several pages"
Scott Main [Sat, 7 Dec 2013 01:42:30 +0000 (01:42 +0000)]
Merge "Revert "add Drive API feature page. fix link text on several pages"" into klp-docs
Scott Main [Sat, 7 Dec 2013 01:42:10 +0000 (01:42 +0000)]
Revert "add Drive API feature page. fix link text on several pages"
This reverts commit
680a1f67cd39b127663d2e8bc4b5f3ca1d868274.
Change-Id: Icc474d08e5fba678b683ae01280e015ae38dcf72
Scott Main [Sat, 7 Dec 2013 00:12:41 +0000 (00:12 +0000)]
am
b821a87d: update robots.txt to disallow the community/ pages
* commit '
b821a87d1b9310d7f07880c80d0b5ccafd59986a':
update robots.txt to disallow the community/ pages
Scott Main [Sat, 7 Dec 2013 00:08:01 +0000 (16:08 -0800)]
update robots.txt to disallow the community/ pages
Change-Id: I318308f7219b296d92039cba2b6f5ace321f697f
Scott Main [Sat, 7 Dec 2013 00:06:29 +0000 (00:06 +0000)]
am
c45eebe1: add Android Community page
* commit '
c45eebe1868deb93c54c29885163a13a497eb86a':
add Android Community page
Scott Main [Thu, 5 Dec 2013 02:34:19 +0000 (18:34 -0800)]
add Android Community page
Change-Id: I8a9c98931b274dbb27d7952e2278eaf7798da343
Scott Main [Fri, 6 Dec 2013 23:38:43 +0000 (23:38 +0000)]
am
680a1f67: add Drive API feature page. fix link text on several pages
* commit '
680a1f67cd39b127663d2e8bc4b5f3ca1d868274':
add Drive API feature page. fix link text on several pages
Scott Main [Fri, 6 Dec 2013 20:57:13 +0000 (12:57 -0800)]
add Drive API feature page.
fix link text on several pages
Change-Id: I717eba278bc2cc09d3ee148a08700e8e353312d2
Dirk Dougherty [Wed, 4 Dec 2013 22:05:51 +0000 (22:05 +0000)]
am
c9cad879: Merge "Doc change: add cropped kk device image and adjust position on highlights doc." into klp-docs
* commit '
c9cad879597dd15983a35fbf997898a771672a69':
Doc change: add cropped kk device image and adjust position on highlights doc.
Dirk Dougherty [Wed, 4 Dec 2013 22:01:41 +0000 (22:01 +0000)]
Merge "Doc change: add cropped kk device image and adjust position on highlights doc." into klp-docs
Dirk Dougherty [Wed, 4 Dec 2013 21:43:48 +0000 (13:43 -0800)]
Doc change: add cropped kk device image and adjust position on highlights doc.
Change-Id: I927091e1251c5477de4462a61c01c9bcf82ad9e2
Geoff Mendal [Wed, 4 Dec 2013 21:01:30 +0000 (13:01 -0800)]
am
6d25c934: (-s ours) Import translations. DO NOT MERGE
* commit '
6d25c934dcdf7a098d4e9f96cb206789dfd4afb7':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Dec 2013 19:35:25 +0000 (11:35 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia2a23f77b1bb0b7fc9d731a185f3104d963cb44d
Auto-generated-cl: translation import
Dirk Dougherty [Wed, 27 Nov 2013 18:34:47 +0000 (10:34 -0800)]
Add samples TOC generated from browsable sources.
Change-Id: I760eceb3a315d5fd1b65ecdcd014a9507990a26b
Scott Main [Mon, 2 Dec 2013 22:20:22 +0000 (22:20 +0000)]
am
2dd715ed: Merge "fix FPS typo in JB highlights, reported by vharron" into klp-docs
* commit '
2dd715ed45b9000eab81b0972d0585294d7f9ddd':
fix FPS typo in JB highlights, reported by vharron
Scott Main [Mon, 2 Dec 2013 22:16:23 +0000 (22:16 +0000)]
Merge "fix FPS typo in JB highlights, reported by vharron" into klp-docs
Dirk Dougherty [Mon, 2 Dec 2013 21:49:31 +0000 (21:49 +0000)]
am
19d3ac5e: Merge "Doc change: update gcore docs to fix javadoc ref error and expose Samples tab." into klp-docs
* commit '
19d3ac5eb67bcb99f249642d41bcea89d7146104':
Doc change: update gcore docs to fix javadoc ref error and expose Samples tab.
Dirk Dougherty [Mon, 2 Dec 2013 21:47:04 +0000 (21:47 +0000)]
Merge "Doc change: update gcore docs to fix javadoc ref error and expose Samples tab." into klp-docs
Dirk Dougherty [Mon, 2 Dec 2013 19:34:20 +0000 (11:34 -0800)]
Doc change: update gcore docs to fix javadoc ref error and expose Samples tab.
Change-Id: I93133f3424127a0e2da256eceee3eebc8c8add18
Scott Main [Mon, 2 Dec 2013 20:55:33 +0000 (12:55 -0800)]
fix FPS typo in JB highlights, reported by vharron
Change-Id: I6a98af7730d1e56f08b5ba9a9f7d462cc35e17e8
Scott Main [Mon, 2 Dec 2013 20:21:33 +0000 (20:21 +0000)]
am
65907fd4: dashboard update for 12/2/13 first appearance of kitkat
* commit '
65907fd4af6a1074a7b052751746fd99095627c6':
dashboard update for 12/2/13 first appearance of kitkat
Scott Main [Mon, 2 Dec 2013 19:38:42 +0000 (11:38 -0800)]
dashboard update for 12/2/13
first appearance of kitkat
Change-Id: I528cb8d938b3a9e0da4c44db2b615ad90c211436
Geoff Mendal [Mon, 2 Dec 2013 18:44:05 +0000 (10:44 -0800)]
am
8d49b29d: (-s ours) Import translations. DO NOT MERGE
* commit '
8d49b29d81be4d7ad694fa222c48c469bd112ca3':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 2 Dec 2013 18:21:45 +0000 (10:21 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ifb196b0f76843e5488d4a387ed4f7add07e84ecd
Auto-generated-cl: translation import
Geoff Mendal [Wed, 27 Nov 2013 18:29:07 +0000 (10:29 -0800)]
am
99dcfed6: (-s ours) Import translations. DO NOT MERGE
* commit '
99dcfed6e90a3639d7d9b8cc2c1654b7cc20d573':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 27 Nov 2013 18:20:55 +0000 (10:20 -0800)]
Import translations. DO NOT MERGE
Change-Id: Icd558c400a77f1e2b72e7279e33c56aa96398a1e
Auto-generated-cl: translation import
Xavier Ducrohet [Wed, 27 Nov 2013 01:54:10 +0000 (17:54 -0800)]
am
1044a1dc: Merge "Update delegate methods in layoutlib." into klp-dev
* commit '
1044a1dc197a9508ef8c6b352e7983ff234b8bc4':
Update delegate methods in layoutlib.
Xavier Ducrohet [Wed, 27 Nov 2013 01:32:26 +0000 (01:32 +0000)]
Merge "Update delegate methods in layoutlib." into klp-dev
Katie McCormick [Tue, 26 Nov 2013 21:58:18 +0000 (21:58 +0000)]
am
9d0a88bd: Merge "Doc updates: Javadoc fixes" into klp-docs
* commit '
9d0a88bd4e07deac01d7759b70cdf160456be1c0':
Doc updates: Javadoc fixes
Katie McCormick [Tue, 26 Nov 2013 21:56:08 +0000 (21:56 +0000)]
Merge "Doc updates: Javadoc fixes" into klp-docs
Katie McCormick [Tue, 26 Nov 2013 19:10:54 +0000 (11:10 -0800)]
Doc updates: Javadoc fixes
Change-Id: I82381056f9f13e53ab8a0525f5a53bf98674c052
Katie McCormick [Tue, 26 Nov 2013 19:09:52 +0000 (19:09 +0000)]
am
752d8029: Merge "Doc update: minor changes to immersive lesson" into klp-docs
* commit '
752d8029176d3670b9e817d8465d854d4a1b933e':
Doc update: minor changes to immersive lesson
Katie McCormick [Tue, 26 Nov 2013 19:06:06 +0000 (19:06 +0000)]
Merge "Doc update: minor changes to immersive lesson" into klp-docs
Deepanshu Gupta [Tue, 26 Nov 2013 03:59:54 +0000 (19:59 -0800)]
Update delegate methods in layoutlib.
Change-Id: I1f0fc274b6a74dbcf0ed46175c4a2fa4c2dd9a63
John Spurlock [Mon, 25 Nov 2013 23:29:29 +0000 (23:29 +0000)]
am
330dfa7d: Merge "Fix @see link in DocumentsContract docs." into klp-docs
* commit '
330dfa7d11c542aa99aa277f75113bfc916d72dd':
Fix @see link in DocumentsContract docs.
John Spurlock [Mon, 25 Nov 2013 23:25:36 +0000 (23:25 +0000)]
Merge "Fix @see link in DocumentsContract docs." into klp-docs
John Spurlock [Mon, 25 Nov 2013 23:00:07 +0000 (18:00 -0500)]
Fix @see link in DocumentsContract docs.
DocumentsContract#createDocument is hidden.
Change-Id: Iae9c4bcd8620c5297d1fc4e2324a8a242ab4b31a
John Spurlock [Mon, 25 Nov 2013 18:39:33 +0000 (18:39 +0000)]
am
125d133b: Fix bad @see links in Intent.java.
* commit '
125d133bcce56403a9b4d1cdbbc61a7cb1d7f8e1':
Fix bad @see links in Intent.java.
Geoff Mendal [Mon, 25 Nov 2013 18:37:07 +0000 (10:37 -0800)]
am
7a4adedf: (-s ours) Import translations. DO NOT MERGE
* commit '
7a4adedf0aa9560578a7cd4b5db8b18ea2f46c4d':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 25 Nov 2013 17:42:45 +0000 (09:42 -0800)]
Import translations. DO NOT MERGE
Change-Id: I7261755eab5c935124863a747fbd09732c6c5288
Auto-generated-cl: translation import
John Spurlock [Mon, 25 Nov 2013 16:58:37 +0000 (11:58 -0500)]
Fix bad @see links in Intent.java.
Change-Id: Ifa283214798f8d2de4f8bdb17ed78609a7d43293
Dirk Dougherty [Sat, 23 Nov 2013 20:28:04 +0000 (20:28 +0000)]
am
6000f1ed: Re-enable samples browser.
* commit '
6000f1ed3d402e3136df173d987c901cc3cc1ff2':
Re-enable samples browser.
Dirk Dougherty [Fri, 22 Nov 2013 22:01:48 +0000 (14:01 -0800)]
Re-enable samples browser.
Change-Id: I9d0c5966422ba0cf8bca576895f30679d40a19ab
Dirk Dougherty [Fri, 22 Nov 2013 18:55:28 +0000 (18:55 +0000)]
am
9eaa9443: Disable samples browsing temporarily.
* commit '
9eaa94439121f6cb03bff8ecf0acbcbc74442f2d':
Disable samples browsing temporarily.
Dirk Dougherty [Fri, 22 Nov 2013 18:46:22 +0000 (10:46 -0800)]
Disable samples browsing temporarily.
Change-Id: I65fe533f1b43903d6605d17691ec142d062b6b5e
Dirk Dougherty [Fri, 22 Nov 2013 18:38:20 +0000 (18:38 +0000)]
am
1448d3cd: Merge "Pass a new samplesdir param to doclava as the starting point for generating samples browsing files. Removes older project-based configuration." into klp-docs
* commit '
1448d3cd81a685c68b0102e8303c0db4e6e5668f':
Pass a new samplesdir param to doclava as the starting point for generating samples browsing files. Removes older project-based configuration.
Dirk Dougherty [Fri, 22 Nov 2013 18:36:03 +0000 (18:36 +0000)]
Merge "Pass a new samplesdir param to doclava as the starting point for generating samples browsing files. Removes older project-based configuration." into klp-docs
Jeff Brown [Fri, 22 Nov 2013 03:43:00 +0000 (19:43 -0800)]
am
ce468a35: Stop wifi display discovery when no longer needed.
* commit '
ce468a35b388ca46578934706b38dbae94941643':
Stop wifi display discovery when no longer needed.
Jeff Brown [Fri, 22 Nov 2013 00:42:03 +0000 (16:42 -0800)]
Stop wifi display discovery when no longer needed.
Keep track of how many clients are requesting scans and scan
continuously until all of them are gone then explicitly terminate the
scan instead of letting it time out as before.
Suspend wifi display scans while connecting or connected to a remote
display. This is handled by both the display manager and media router
since neither has complete information about what is happening.
Much of this code will no longer be needed once wifi display support
is integrated directly into the media router service.
Ensure that we don't attempt to scan or connect to wifi displays
while the wifi display feature is off.
Infer when a connection attempt fails and unselect the wifi display
route automatically so it doesn't appear to be connecting forever.
Fix issues around correctly canceling and retrying connection attempts.
Often we would cancel but not retry.
Improved connection reliability somewhat. It seems that discovery must
already be in progress in order for a connection attempt to succeed.
Ensure QuickSettings uses exactly the same logic as the MediaRouteButton
to determine when the remote display tile should be made visible.
Bug:
11717053
Change-Id: I18afc977b0e8c26204b8c96adaa79f05225f7b6e
Dirk Dougherty [Fri, 22 Nov 2013 02:11:58 +0000 (18:11 -0800)]
Pass a new samplesdir param to doclava as the starting point for generating samples browsing files. Removes older project-based configuration.
Change-Id: If59372a92f0572d54af0f2ed7f9f9e401fbce067
Newton Allen [Thu, 21 Nov 2013 23:28:28 +0000 (23:28 +0000)]
am
28029658: Fix javadoc typo in SparseArray.
* commit '
2802965888566244d8642ba32775b7b2a3cec655':
Fix javadoc typo in SparseArray.
Newton Allen [Thu, 21 Nov 2013 21:27:10 +0000 (13:27 -0800)]
Fix javadoc typo in SparseArray.
Change-Id: Ie69b2cf96dae95b6ebe7b7797d3755749aec9f35
(cherry picked from commit
ebb47950f21d3c41955a591000dfb1f195e746fe)
Dianne Hackborn [Thu, 21 Nov 2013 22:08:00 +0000 (14:08 -0800)]
am
90e9b1d3: Fix issue #
11790471: Crash removed home buttons and notification bar/shade
* commit '
90e9b1d3dc15e97bb7ecb88289c3707fe03fb1a6':
Fix issue #
11790471: Crash removed home buttons and notification bar/shade
Dianne Hackborn [Thu, 21 Nov 2013 20:50:01 +0000 (12:50 -0800)]
Fix issue #
11790471: Crash removed home buttons and notification bar/shade
Whoops persistent processes are, well, persistent. Don't remove
services from them. We'll be keeping that process record around.
Change-Id: I29e9fb6f704efdf0caad5e0307a7adbb416eed3b
Svetoslav Ganov [Thu, 21 Nov 2013 20:15:22 +0000 (12:15 -0800)]
am
c6db9c3b: Merge "Revert "PreferenceFragment showing the breadcrumb when not needed."" into klp-dev
* commit '
c6db9c3b371ed8a90fa064f0487440d8a1d8bd46':
Revert "PreferenceFragment showing the breadcrumb when not needed."
Svetoslav Ganov [Thu, 21 Nov 2013 20:15:19 +0000 (12:15 -0800)]
am
4d159661: Merge "Revert "PreferencesFragment showing the breadcrumb area in single pane mode."" into klp-dev
* commit '
4d159661f453fa5d04698033f4bf6256f0d3c16a':
Revert "PreferencesFragment showing the breadcrumb area in single pane mode."
Svetoslav Ganov [Thu, 21 Nov 2013 20:12:12 +0000 (20:12 +0000)]
Merge "Revert "PreferenceFragment showing the breadcrumb when not needed."" into klp-dev
Svetoslav Ganov [Thu, 21 Nov 2013 20:12:02 +0000 (20:12 +0000)]
Merge "Revert "PreferencesFragment showing the breadcrumb area in single pane mode."" into klp-dev
Dirk Dougherty [Thu, 21 Nov 2013 19:49:46 +0000 (19:49 +0000)]
am
43eea0a6: Merge "Doc change: Change description for BRAND. Bug:
11431921" into klp-docs
* commit '
43eea0a640db07c4da05146f7e68eae567592bdb':
Doc change: Change description for BRAND. Bug:
11431921
Dirk Dougherty [Thu, 21 Nov 2013 19:45:45 +0000 (19:45 +0000)]
Merge "Doc change: Change description for BRAND. Bug:
11431921" into klp-docs
Svetoslav Ganov [Thu, 21 Nov 2013 19:36:22 +0000 (19:36 +0000)]
Revert "PreferenceFragment showing the breadcrumb when not needed."
This reverts commit
7db97b0a29c613afb78c2734bf2504324a71963d.
Change-Id: Iefe9807fd75baf04e61ec59b508e438320c80fe3
Svetoslav Ganov [Thu, 21 Nov 2013 19:33:53 +0000 (19:33 +0000)]
Revert "PreferencesFragment showing the breadcrumb area in single pane mode."
This reverts commit
2b8795a9db2d494c38d34fd113a9153880a555c0.
Change-Id: If8dcc7190cbe66af09945d8b23a3e1d8fd791b1d
Katie McCormick [Thu, 21 Nov 2013 19:29:32 +0000 (19:29 +0000)]
am
4181da02: Merge "Doc update: Minor additions to storage doc" into klp-docs
* commit '
4181da02966255cc50e6a0af3e9fba38812abc8a':
Doc update: Minor additions to storage doc
Katie McCormick [Thu, 21 Nov 2013 19:26:36 +0000 (19:26 +0000)]
Merge "Doc update: Minor additions to storage doc" into klp-docs
Katie McCormick [Wed, 13 Nov 2013 02:42:08 +0000 (18:42 -0800)]
Doc update: Minor additions to storage doc
Change-Id: I59aa961a94393221be3c5f847a9fc82aa43e3a6f
Geoff Mendal [Thu, 21 Nov 2013 18:53:28 +0000 (10:53 -0800)]
am
35f097a7: (-s ours) Import translations. DO NOT MERGE
* commit '
35f097a7bf4f30d0006221e9ae376ab85ab6937a':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 21 Nov 2013 18:42:03 +0000 (10:42 -0800)]
Import translations. DO NOT MERGE
Change-Id: I9cb0b85bb832e20fadbeb464485d0f0dc1e8b762
Auto-generated-cl: translation import
Dirk Dougherty [Thu, 21 Nov 2013 18:29:38 +0000 (18:29 +0000)]
am
58c168a1: Merge "Doc change: update download progress image." into klp-docs
* commit '
58c168a1b934c61472176d6de3cfa8996953126c':
Doc change: update download progress image.
Dirk Dougherty [Thu, 21 Nov 2013 18:26:05 +0000 (18:26 +0000)]
Merge "Doc change: update download progress image." into klp-docs
Dirk Dougherty [Thu, 21 Nov 2013 17:49:40 +0000 (09:49 -0800)]
Doc change: update download progress image.
Change-Id: Ib0a4a00cc69a5fa6c552f70aaf40a682e539c41e
Dirk Dougherty [Wed, 30 Oct 2013 01:33:29 +0000 (18:33 -0700)]
Doc change: Change description for BRAND.
Bug:
11431921
Change-Id: Id08bb58a52699942e0cf626aeb577ac05c84c575
Jeff Brown [Thu, 21 Nov 2013 00:48:52 +0000 (16:48 -0800)]
am
b40ce4b8: Make action bar media router icons blue again.
* commit '
b40ce4b8e85b44c8dc190bdfac0106402102280b':
Make action bar media router icons blue again.
Scott Main [Thu, 21 Nov 2013 00:29:41 +0000 (00:29 +0000)]
am
93fd2d0e: add Google+ links to support page bug:
7143885
* commit '
93fd2d0ea771e08f5ae124120875fb779010b87a':
add Google+ links to support page bug:
7143885
Scott Main [Wed, 20 Nov 2013 23:33:33 +0000 (15:33 -0800)]
add Google+ links to support page
bug:
7143885
Change-Id: I200d7b84694169e5adf2d13a0b6f2c56ab76a727
Jeff Brown [Wed, 20 Nov 2013 23:27:14 +0000 (15:27 -0800)]
Make action bar media router icons blue again.
This partially reverts commit
e7ae644522f692c204d0233f91e77c7841bdfe53.
Bug:
11790271
Change-Id: Ib83dbede4472ba08bcf79bf9009d690278841723
Chong Zhang [Wed, 20 Nov 2013 22:27:44 +0000 (14:27 -0800)]
am
bfdecccc: Merge "Only scan for wifi display when there is no active connections" into klp-dev
* commit '
bfdecccc48ef2fd9bfb19d77be2492f22971fed9':
Only scan for wifi display when there is no active connections
Chong Zhang [Wed, 20 Nov 2013 22:24:20 +0000 (22:24 +0000)]
Merge "Only scan for wifi display when there is no active connections" into klp-dev
Baligh Uddin [Wed, 20 Nov 2013 21:11:58 +0000 (13:11 -0800)]
am
bc77af5b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
bc77af5b4c2161d7bc1e2de7dc472f343d7f9581':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 20 Nov 2013 21:08:31 +0000 (21:08 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Scott Main [Wed, 20 Nov 2013 21:02:38 +0000 (21:02 +0000)]
am
3aec4328: add Analytics event tracking for Studio download
* commit '
3aec4328da1e02993517ddc9c119aca24c7ce680':
add Analytics event tracking for Studio download
Scott Main [Wed, 20 Nov 2013 20:51:28 +0000 (12:51 -0800)]
add Analytics event tracking for Studio download
Change-Id: I85c2db10d431f32316eabdae5d37e03afd7e83bf
Scott Main [Wed, 20 Nov 2013 20:39:15 +0000 (20:39 +0000)]
am
64fedb77: add new video button to some pages
* commit '
64fedb7725f082ce6bde94c3599d2e7c203ae077':
add new video button to some pages
Scott Main [Tue, 12 Nov 2013 17:12:38 +0000 (09:12 -0800)]
add new video button to some pages
Change-Id: Ie1f1875d041ff662aee709cd5f7d3110e438d0d5
Baligh Uddin [Wed, 20 Nov 2013 17:50:34 +0000 (09:50 -0800)]
Import translations. DO NOT MERGE
Change-Id: I499aa31a9f0e9a997d5e60eb778f16bc3b497663
Auto-generated-cl: translation import
Baligh Uddin [Wed, 20 Nov 2013 17:37:51 +0000 (09:37 -0800)]
am
853251e7: (-s ours) Import translations. DO NOT MERGE
* commit '
853251e74f3e603f3431a3317b4d27ee042a4eb1':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 20 Nov 2013 17:17:20 +0000 (09:17 -0800)]
Import translations. DO NOT MERGE
Change-Id: I0e8d6e841629716aecaea4bc1f326c1c2cba95c4
Auto-generated-cl: translation import
Chong Zhang [Wed, 20 Nov 2013 03:13:22 +0000 (19:13 -0800)]
Only scan for wifi display when there is no active connections
Bug:
11717053
Change-Id: I4ab73f6517fbfb8fcc131b89d0e934380dcf69e0
Dirk Dougherty [Wed, 20 Nov 2013 02:16:21 +0000 (02:16 +0000)]
am
acca12fa: Merge "Doc change: move localized files into an intl dir. Build output remains the same for online, offline, and ds docs." into klp-docs
* commit '
acca12faea5fc1c9de63fdc08ae4d6bc0bad864a':
Doc change: move localized files into an intl dir. Build output remains the same for online, offline, and ds docs.
Dirk Dougherty [Wed, 20 Nov 2013 02:13:48 +0000 (02:13 +0000)]
Merge "Doc change: move localized files into an intl dir. Build output remains the same for online, offline, and ds docs." into klp-docs
Dirk Dougherty [Tue, 19 Nov 2013 21:15:07 +0000 (13:15 -0800)]
Doc change: move localized files into an intl dir. Build output remains the same for online, offline, and ds docs.
Change-Id: Ia75712323563cf56f0224822cb7977f3421f8527
Katie McCormick [Wed, 20 Nov 2013 01:10:37 +0000 (01:10 +0000)]
am
39711934: Merge "Doc update: redo of new API Console steps." into klp-docs
* commit '
39711934023b088887a08d833674170938f82a7d':
Doc update: redo of new API Console steps.
Katie McCormick [Wed, 20 Nov 2013 01:07:56 +0000 (01:07 +0000)]
Merge "Doc update: redo of new API Console steps." into klp-docs
Katie McCormick [Sat, 16 Nov 2013 00:02:58 +0000 (16:02 -0800)]
Doc update: redo of new API Console steps.
Fixes for:
b/
11713745
b/
11712882
b/
10669388
b/
10641901
Change-Id: I071eba31d51f0e29b9be4a7f7ede0f01c7a52838
Christopher Tate [Tue, 19 Nov 2013 19:46:48 +0000 (11:46 -0800)]
am
b0183f0a: Harden against transiently unavailable backup transports
* commit '
b0183f0ae311966cff0e10e8139c56f97288d1f2':
Harden against transiently unavailable backup transports