OSDN Git Service

android-x86/build.git
11 years agoam 2cb0549a: Reconcile with jb-dev
Jean-Baptiste Queru [Wed, 3 Oct 2012 22:17:32 +0000 (15:17 -0700)]
am 2cb0549a: Reconcile with jb-dev

* commit '2cb0549a18232b262b5c01b86319cbc6fece252e':

11 years agoReconcile with jb-dev
Jean-Baptiste Queru [Wed, 3 Oct 2012 22:14:31 +0000 (15:14 -0700)]
Reconcile with jb-dev

Change-Id: I759af63dfafa66468b93dc7c4ef7db42d760c4d6

11 years agoresolved conflicts for merge of 01b2aaaa to jb-mr1-dev-plus-aosp
Elliott Hughes [Wed, 3 Oct 2012 19:13:38 +0000 (12:13 -0700)]
resolved conflicts for merge of 01b2aaaa to jb-mr1-dev-plus-aosp

Change-Id: I66481eb8b269775716f79e42e9d89c2ebbd45288

11 years agoam 69a49f75: Merge changes I21eb93f3,I0be5e272,I158b0d7e
Elliott Hughes [Wed, 3 Oct 2012 18:55:24 +0000 (11:55 -0700)]
am 69a49f75: Merge changes I21eb93f3,I0be5e272,I158b0d7e

* commit '69a49f75860b4849fd1c2fe68d97fa2243171131':
  Build only modules required by the current product.
  Load only the current product config makefile.
  Run clean steps in only given paths when using mm/mmm

11 years agoMerge changes I21eb93f3,I0be5e272,I158b0d7e
Elliott Hughes [Wed, 3 Oct 2012 18:29:23 +0000 (11:29 -0700)]
Merge changes I21eb93f3,I0be5e272,I158b0d7e

* changes:
  Build only modules required by the current product.
  Load only the current product config makefile.
  Run clean steps in only given paths when using mm/mmm

11 years agoBuild only modules required by the current product.
Ying Wang [Fri, 28 Sep 2012 00:42:04 +0000 (17:42 -0700)]
Build only modules required by the current product.

Don't build modules_to_check by default.
Instead add "checkbuild" to the command line as a build goal, if you
want to build everything.
We can use the "checkbuild" goal to make sure some build targets on the
build server still build everything.

(cherry-pick of 5a88269ad6ed44fb163f96847954faac21292567.)

Bug: 7253452
Change-Id: I21eb93f3cb430c9531fe41a2f5d7b445c09938b9

11 years agoLoad only the current product config makefile.
Ying Wang [Thu, 27 Sep 2012 20:26:25 +0000 (13:26 -0700)]
Load only the current product config makefile.

To reduce the start time.
With the change and previous change of doing clean step in only given paths,
start time of mm/mmm is reduced from ~5s to about 1s;
lunch time is reduced from ~40s to 3.5s.

(cherry-pick of 157a5e1695593f935c3223430f4530e21f990378.)

Bug: 7186768,7169854
Change-Id: I0be5e2721efa66a80f112acf8f95e177ebc2f65b

11 years agoRun clean steps in only given paths when using mm/mmm
Ying Wang [Wed, 26 Sep 2012 23:00:54 +0000 (16:00 -0700)]
Run clean steps in only given paths when using mm/mmm

To speed up mm/mmm start time.
At the same time, we should copy over the other clean steps.

(cherry-pick of 6ea58cb3dc564ce112b28f1a7c6936317168d931.)

Bug: 7186768
Change-Id: I158b0d7e4ecaa773ec3a336cd326e27ee8c26a88

11 years agoReconcile with jb-mr1-release - do not merge
The Android Open Source Project [Wed, 3 Oct 2012 14:33:07 +0000 (07:33 -0700)]
Reconcile with jb-mr1-release - do not merge

Change-Id: Ice6704d7d776ae5efb5ec251fe9809054807c119

11 years agoJOP03
The Android Automerger [Wed, 3 Oct 2012 14:01:14 +0000 (07:01 -0700)]
JOP03

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Wed, 3 Oct 2012 13:59:14 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoam cd67e0e1: am 8cb3263d: am 55b19bdd: am 9341d398: am a4888dc8: adjust position...
Scott Main [Wed, 3 Oct 2012 06:36:38 +0000 (23:36 -0700)]
am cd67e0e1: am 8cb3263d: am 55b19bdd: am 9341d398: am a4888dc8: adjust position of prev/next links at bottom of page to account for russian string length

* commit 'cd67e0e13e28f2b98b05aa6dc5385242123b1fb2':
  adjust position of prev/next links at bottom of page to account for russian string length

11 years agoam 8cb3263d: am 55b19bdd: am 9341d398: am a4888dc8: adjust position of prev/next...
Scott Main [Wed, 3 Oct 2012 06:34:26 +0000 (23:34 -0700)]
am 8cb3263d: am 55b19bdd: am 9341d398: am a4888dc8: adjust position of prev/next links at bottom of page to account for russian string length

* commit '8cb3263dd0cc35b16f74fefe154988da35e1a4ab':
  adjust position of prev/next links at bottom of page to account for russian string length

11 years agoam 55b19bdd: am 9341d398: am a4888dc8: adjust position of prev/next links at bottom...
Scott Main [Wed, 3 Oct 2012 06:32:42 +0000 (23:32 -0700)]
am 55b19bdd: am 9341d398: am a4888dc8: adjust position of prev/next links at bottom of page to account for russian string length

* commit '55b19bddcc6dfe750a1df70fe9955a42701f0007':
  adjust position of prev/next links at bottom of page to account for russian string length

11 years agoam 9341d398: am a4888dc8: adjust position of prev/next links at bottom of page to...
Scott Main [Wed, 3 Oct 2012 06:31:34 +0000 (23:31 -0700)]
am 9341d398: am a4888dc8: adjust position of prev/next links at bottom of page to account for russian string length

* commit '9341d398a87fd9679366fafbbc398601c4c01de4':
  adjust position of prev/next links at bottom of page to account for russian string length

11 years agoam a4888dc8: adjust position of prev/next links at bottom of page to account for...
Scott Main [Wed, 3 Oct 2012 06:30:35 +0000 (23:30 -0700)]
am a4888dc8: adjust position of prev/next links at bottom of page to account for russian string length

* commit 'a4888dc8657c46ff3fec9ae2e840432255d40a88':
  adjust position of prev/next links at bottom of page to account for russian string length

11 years agoadjust position of prev/next links at bottom of page to account for russian string...
Scott Main [Wed, 3 Oct 2012 06:25:21 +0000 (23:25 -0700)]
adjust position of prev/next links at bottom of page to account for russian string length

Change-Id: I450a11e49fb16bb9e30140d78b190d06b39e1b13

11 years agoam b41d19c9: am e41404f4: am 83fca03d: (-s ours) am 5150b1f7: am f3d0104a: (-s ours...
Scott Main [Wed, 3 Oct 2012 04:11:20 +0000 (21:11 -0700)]
am b41d19c9: am e41404f4: am 83fca03d: (-s ours) am 5150b1f7: am f3d0104a: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: Iaab2b30349943a236607d54394019fa8d89de800

* commit 'b41d19c9abe98b59b095e2722993ed96ee287748':
  DO NOT MERGE cherrypick from jb-dev Change-Id: Iaab2b30349943a236607d54394019fa8d89de800

11 years agoam 6190ac59: am a168a83a: am c914b5bf: (-s ours) am 142158bd: am 6eb95f1a: (-s ours...
Scott Main [Wed, 3 Oct 2012 04:11:19 +0000 (21:11 -0700)]
am 6190ac59: am a168a83a: am c914b5bf: (-s ours) am 142158bd: am 6eb95f1a: (-s ours) DO NOT MERGE cherypick from jb-dev Change-Id: Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73

* commit '6190ac593ab0188acc274ef40504bd71c2a76e27':
  DO NOT MERGE cherypick from jb-dev Change-Id: Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73

11 years agoam e41404f4: am 83fca03d: (-s ours) am 5150b1f7: am f3d0104a: (-s ours) DO NOT MERGE...
Scott Main [Wed, 3 Oct 2012 04:09:30 +0000 (21:09 -0700)]
am e41404f4: am 83fca03d: (-s ours) am 5150b1f7: am f3d0104a: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: Iaab2b30349943a236607d54394019fa8d89de800

* commit 'e41404f496002a24f670f6c16f3fbae07b10ce3e':
  DO NOT MERGE cherrypick from jb-dev Change-Id: Iaab2b30349943a236607d54394019fa8d89de800

11 years agoam a168a83a: am c914b5bf: (-s ours) am 142158bd: am 6eb95f1a: (-s ours) DO NOT MERGE...
Scott Main [Wed, 3 Oct 2012 04:09:29 +0000 (21:09 -0700)]
am a168a83a: am c914b5bf: (-s ours) am 142158bd: am 6eb95f1a: (-s ours) DO NOT MERGE cherypick from jb-dev Change-Id: Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73

* commit 'a168a83a8940eea54ee66bb7610a63ce49c67874':
  DO NOT MERGE cherypick from jb-dev Change-Id: Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73

11 years agoam 155a16ab: am 86834682: am 4f5f71a1: (-s ours) am f5878b3e: am aa2ce5d9: (-s ours...
Scott Main [Wed, 3 Oct 2012 04:07:49 +0000 (21:07 -0700)]
am 155a16ab: am 86834682: am 4f5f71a1: (-s ours) am f5878b3e: am aa2ce5d9: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: I90412e1e03a2676d927796187fe811481bf38455 add localize langs for global strings

* commit '155a16aba065f115cae3d4f65e2a42dfcd3b6672':
  DO NOT MERGE cherrypick from jb-dev Change-Id: I90412e1e03a2676d927796187fe811481bf38455 add localize langs for global strings

11 years agoam 83fca03d: (-s ours) am 5150b1f7: am f3d0104a: (-s ours) DO NOT MERGE cherrypick...
Scott Main [Wed, 3 Oct 2012 04:07:42 +0000 (21:07 -0700)]
am 83fca03d: (-s ours) am 5150b1f7: am f3d0104a: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: Iaab2b30349943a236607d54394019fa8d89de800

* commit '83fca03d080b88d5ecda75f6c5b5a1f44fa25d8f':
  DO NOT MERGE cherrypick from jb-dev Change-Id: Iaab2b30349943a236607d54394019fa8d89de800

11 years agoam c914b5bf: (-s ours) am 142158bd: am 6eb95f1a: (-s ours) DO NOT MERGE cherypick...
Scott Main [Wed, 3 Oct 2012 04:07:40 +0000 (21:07 -0700)]
am c914b5bf: (-s ours) am 142158bd: am 6eb95f1a: (-s ours) DO NOT MERGE cherypick from jb-dev Change-Id: Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73

* commit 'c914b5bf5224f2d5fcc24026c35c2e4ffd7588d7':
  DO NOT MERGE cherypick from jb-dev Change-Id: Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73

11 years agoam a6481fe7: am 3ef75927: am 589622a4: (-s ours) am e0cc9e30: am 24bbcd50: (-s ours...
Scott Main [Wed, 3 Oct 2012 04:06:21 +0000 (21:06 -0700)]
am a6481fe7: am 3ef75927: am 589622a4: (-s ours) am e0cc9e30: am 24bbcd50: (-s ours) DO NOT MERGE cherrypick from jb-devChange-Id: I6eb11d3629dd13d2c7ac297cc9fa3828ed59f170 add style for code captions; ignore sidenav headers for HRs

* commit 'a6481fe7e4b2702092f1d21e7f3ac3b1ab6b3576':
  DO NOT MERGE cherrypick from jb-devChange-Id: I6eb11d3629dd13d2c7ac297cc9fa3828ed59f170 add style for code captions; ignore sidenav headers for HRs

11 years agoam 86834682: am 4f5f71a1: (-s ours) am f5878b3e: am aa2ce5d9: (-s ours) DO NOT MERGE...
Scott Main [Wed, 3 Oct 2012 04:06:00 +0000 (21:06 -0700)]
am 86834682: am 4f5f71a1: (-s ours) am f5878b3e: am aa2ce5d9: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: I90412e1e03a2676d927796187fe811481bf38455 add localize langs for global strings

* commit '868346827c5e1f5939c3669ee24c75da4489181e':
  DO NOT MERGE cherrypick from jb-dev Change-Id: I90412e1e03a2676d927796187fe811481bf38455 add localize langs for global strings

11 years agoam 5150b1f7: am f3d0104a: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id...
Scott Main [Wed, 3 Oct 2012 04:05:26 +0000 (21:05 -0700)]
am 5150b1f7: am f3d0104a: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: Iaab2b30349943a236607d54394019fa8d89de800

* commit '5150b1f770301f5359c07da1be5ce0fdaf342ba9':
  DO NOT MERGE cherrypick from jb-dev Change-Id: Iaab2b30349943a236607d54394019fa8d89de800

11 years agoam 142158bd: am 6eb95f1a: (-s ours) DO NOT MERGE cherypick from jb-dev Change-Id...
Scott Main [Wed, 3 Oct 2012 04:05:25 +0000 (21:05 -0700)]
am 142158bd: am 6eb95f1a: (-s ours) DO NOT MERGE cherypick from jb-dev Change-Id: Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73

* commit '142158bd218421741d6d133e9ebbb1203ae6e6a6':
  DO NOT MERGE cherypick from jb-dev Change-Id: Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73

11 years agoam 94bb600f: am eb0bce61: am 6856ef5b: (-s ours) am 61e63c8a: am 52948fcf: (-s ours...
Scott Main [Wed, 3 Oct 2012 04:04:53 +0000 (21:04 -0700)]
am 94bb600f: am eb0bce61: am 6856ef5b: (-s ours) am 61e63c8a: am 52948fcf: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: I792cca40a4cca6f811d1528219e51b3895d4d626 create consistent spacing between lists and the paragraphs within them

* commit '94bb600f522e3a6599c66a86aa66f4aba9d41796':
  DO NOT MERGE cherrypick from jb-dev Change-Id: I792cca40a4cca6f811d1528219e51b3895d4d626 create consistent spacing between lists and the paragraphs within them

11 years agoam 3ef75927: am 589622a4: (-s ours) am e0cc9e30: am 24bbcd50: (-s ours) DO NOT MERGE...
Scott Main [Wed, 3 Oct 2012 04:04:32 +0000 (21:04 -0700)]
am 3ef75927: am 589622a4: (-s ours) am e0cc9e30: am 24bbcd50: (-s ours) DO NOT MERGE cherrypick from jb-devChange-Id: I6eb11d3629dd13d2c7ac297cc9fa3828ed59f170 add style for code captions; ignore sidenav headers for HRs

* commit '3ef7592761cacc3ac5f77576904b3bfb30e066ab':
  DO NOT MERGE cherrypick from jb-devChange-Id: I6eb11d3629dd13d2c7ac297cc9fa3828ed59f170 add style for code captions; ignore sidenav headers for HRs

11 years agoam f3d0104a: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: Iaab2b30349943a...
Scott Main [Wed, 3 Oct 2012 04:04:28 +0000 (21:04 -0700)]
am f3d0104a: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: Iaab2b30349943a236607d54394019fa8d89de800

* commit 'f3d0104a8039af22daab02a914c6639fe078c9a6':
  DO NOT MERGE cherrypick from jb-dev Change-Id: Iaab2b30349943a236607d54394019fa8d89de800

11 years agoam 4f5f71a1: (-s ours) am f5878b3e: am aa2ce5d9: (-s ours) DO NOT MERGE cherrypick...
Scott Main [Wed, 3 Oct 2012 04:04:11 +0000 (21:04 -0700)]
am 4f5f71a1: (-s ours) am f5878b3e: am aa2ce5d9: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: I90412e1e03a2676d927796187fe811481bf38455 add localize langs for global strings

* commit '4f5f71a17d8963acf3642c91e3fb711d5f11a99c':
  DO NOT MERGE cherrypick from jb-dev Change-Id: I90412e1e03a2676d927796187fe811481bf38455 add localize langs for global strings

11 years agoam 6eb95f1a: (-s ours) DO NOT MERGE cherypick from jb-dev Change-Id: Ifcae4fcf716c8bb...
Scott Main [Wed, 3 Oct 2012 04:03:18 +0000 (21:03 -0700)]
am 6eb95f1a: (-s ours) DO NOT MERGE cherypick from jb-dev Change-Id: Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73

* commit '6eb95f1ac83a02a7bdb68cdcc5a09e7079ff46c0':
  DO NOT MERGE cherypick from jb-dev Change-Id: Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73

11 years agoam eb0bce61: am 6856ef5b: (-s ours) am 61e63c8a: am 52948fcf: (-s ours) DO NOT MERGE...
Scott Main [Wed, 3 Oct 2012 04:03:07 +0000 (21:03 -0700)]
am eb0bce61: am 6856ef5b: (-s ours) am 61e63c8a: am 52948fcf: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: I792cca40a4cca6f811d1528219e51b3895d4d626 create consistent spacing between lists and the paragraphs within them

* commit 'eb0bce61d7d150e2f9a7f4aa1eed11b91645c0a2':
  DO NOT MERGE cherrypick from jb-dev Change-Id: I792cca40a4cca6f811d1528219e51b3895d4d626 create consistent spacing between lists and the paragraphs within them

11 years agoam f5878b3e: am aa2ce5d9: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id...
Scott Main [Wed, 3 Oct 2012 04:03:01 +0000 (21:03 -0700)]
am f5878b3e: am aa2ce5d9: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: I90412e1e03a2676d927796187fe811481bf38455 add localize langs for global strings

* commit 'f5878b3ea31a04d13888f14bd652340da8a38437':
  DO NOT MERGE cherrypick from jb-dev Change-Id: I90412e1e03a2676d927796187fe811481bf38455 add localize langs for global strings

11 years agoam 589622a4: (-s ours) am e0cc9e30: am 24bbcd50: (-s ours) DO NOT MERGE cherrypick...
Scott Main [Wed, 3 Oct 2012 04:02:46 +0000 (21:02 -0700)]
am 589622a4: (-s ours) am e0cc9e30: am 24bbcd50: (-s ours) DO NOT MERGE cherrypick from jb-devChange-Id: I6eb11d3629dd13d2c7ac297cc9fa3828ed59f170 add style for code captions; ignore sidenav headers for HRs

* commit '589622a47da216ab2b31e94011ae9985e4029891':
  DO NOT MERGE cherrypick from jb-devChange-Id: I6eb11d3629dd13d2c7ac297cc9fa3828ed59f170 add style for code captions; ignore sidenav headers for HRs

11 years agoDO NOT MERGE
Scott Main [Wed, 3 Oct 2012 03:36:45 +0000 (20:36 -0700)]
DO NOT MERGE
cherrypick from jb-dev Change-Id: Iaab2b30349943a236607d54394019fa8d89de800

provide more width for buttons in training top nav to accomodate longer
strings from translation

Change-Id: Ia1d8f7caa532ad1060d8a54fda082ada754c1f48

11 years agoam aa2ce5d9: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: I90412e1e03a267...
Scott Main [Wed, 3 Oct 2012 04:01:07 +0000 (21:01 -0700)]
am aa2ce5d9: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: I90412e1e03a2676d927796187fe811481bf38455 add localize langs for global strings

* commit 'aa2ce5d9aa16d72e4f5c4203bc9a8c6f87d83719':
  DO NOT MERGE cherrypick from jb-dev Change-Id: I90412e1e03a2676d927796187fe811481bf38455 add localize langs for global strings

11 years agoDO NOT MERGE
Scott Main [Wed, 3 Oct 2012 00:12:23 +0000 (17:12 -0700)]
DO NOT MERGE
cherypick from jb-dev Change-Id: Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73

refactor the logic for changing languages in global strings.
instead of using separate <span> elements for each language,
provide a unique attribute in each <a> element for each localized
version of that link's title.

Change-Id: I09c65a8dce9b3d9623e32fe17876b055e452618b

11 years agoam e0cc9e30: am 24bbcd50: (-s ours) DO NOT MERGE cherrypick from jb-devChange-Id...
Scott Main [Wed, 3 Oct 2012 04:00:33 +0000 (21:00 -0700)]
am e0cc9e30: am 24bbcd50: (-s ours) DO NOT MERGE cherrypick from jb-devChange-Id: I6eb11d3629dd13d2c7ac297cc9fa3828ed59f170 add style for code captions; ignore sidenav headers for HRs

* commit 'e0cc9e30520b0fb7690b3f4724fc0ce77c7f03e4':
  DO NOT MERGE cherrypick from jb-devChange-Id: I6eb11d3629dd13d2c7ac297cc9fa3828ed59f170 add style for code captions; ignore sidenav headers for HRs

11 years agoam 6856ef5b: (-s ours) am 61e63c8a: am 52948fcf: (-s ours) DO NOT MERGE cherrypick...
Scott Main [Wed, 3 Oct 2012 04:00:19 +0000 (21:00 -0700)]
am 6856ef5b: (-s ours) am 61e63c8a: am 52948fcf: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: I792cca40a4cca6f811d1528219e51b3895d4d626 create consistent spacing between lists and the paragraphs within them

* commit '6856ef5b07b128ecb5daa966f7486503b9cc5f20':
  DO NOT MERGE cherrypick from jb-dev Change-Id: I792cca40a4cca6f811d1528219e51b3895d4d626 create consistent spacing between lists and the paragraphs within them

11 years agoam 61e63c8a: am 52948fcf: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id...
Scott Main [Wed, 3 Oct 2012 03:59:09 +0000 (20:59 -0700)]
am 61e63c8a: am 52948fcf: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: I792cca40a4cca6f811d1528219e51b3895d4d626 create consistent spacing between lists and the paragraphs within them

* commit '61e63c8a4bdb6174a08023d4b55fe2af896ed878':
  DO NOT MERGE cherrypick from jb-dev Change-Id: I792cca40a4cca6f811d1528219e51b3895d4d626 create consistent spacing between lists and the paragraphs within them

11 years agoam 24bbcd50: (-s ours) DO NOT MERGE cherrypick from jb-devChange-Id: I6eb11d3629dd13d...
Scott Main [Wed, 3 Oct 2012 03:58:54 +0000 (20:58 -0700)]
am 24bbcd50: (-s ours) DO NOT MERGE cherrypick from jb-devChange-Id: I6eb11d3629dd13d2c7ac297cc9fa3828ed59f170 add style for code captions; ignore sidenav headers for HRs

* commit '24bbcd5026cd8de5a77cd09ec8754753fff2280b':
  DO NOT MERGE cherrypick from jb-devChange-Id: I6eb11d3629dd13d2c7ac297cc9fa3828ed59f170 add style for code captions; ignore sidenav headers for HRs

11 years agoDO NOT MERGE
Scott Main [Sat, 22 Sep 2012 03:32:56 +0000 (20:32 -0700)]
DO NOT MERGE
cherrypick from jb-dev Change-Id: I90412e1e03a2676d927796187fe811481bf38455
add localize langs for global strings

Change-Id: I02b6c5b5d83247a352dc041e9885befe82502adc

11 years agoam 52948fcf: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: I792cca40a4cca6...
Scott Main [Wed, 3 Oct 2012 03:57:44 +0000 (20:57 -0700)]
am 52948fcf: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: I792cca40a4cca6f811d1528219e51b3895d4d626 create consistent spacing between lists and the paragraphs within them

* commit '52948fcf8ccdad1f4ba91d63ece2022e2d807aff':
  DO NOT MERGE cherrypick from jb-dev Change-Id: I792cca40a4cca6f811d1528219e51b3895d4d626 create consistent spacing between lists and the paragraphs within them

11 years agoDO NOT MERGE
Scott Main [Fri, 21 Sep 2012 21:33:43 +0000 (14:33 -0700)]
DO NOT MERGE
cherrypick from jb-devChange-Id: I6eb11d3629dd13d2c7ac297cc9fa3828ed59f170
add style for code captions;
ignore sidenav headers for HRs

Change-Id: Ic7768dc388a3871be8b02634e2b70f360a62e407

11 years agoDO NOT MERGE
Scott Main [Tue, 18 Sep 2012 18:27:59 +0000 (11:27 -0700)]
DO NOT MERGE
cherrypick from jb-dev Change-Id: I792cca40a4cca6f811d1528219e51b3895d4d626
create consistent spacing between lists and the paragraphs within them

Change-Id: I4977e4f6f34c7fb8605c861ebb4b33895f630977

11 years agoam a67b7aa5: am b61c601b: am 2452b062: am 0c81a130: provide more width for buttons...
Scott Main [Wed, 3 Oct 2012 03:45:53 +0000 (20:45 -0700)]
am a67b7aa5: am b61c601b: am 2452b062: am 0c81a130: provide more width for buttons in training top nav to accomodate longer strings from translation

* commit 'a67b7aa5ae57af9c8ae5fcce98480c4010c18733':
  provide more width for buttons in training top nav to accomodate longer strings from translation

11 years agoam b61c601b: am 2452b062: am 0c81a130: provide more width for buttons in training...
Scott Main [Wed, 3 Oct 2012 03:44:10 +0000 (20:44 -0700)]
am b61c601b: am 2452b062: am 0c81a130: provide more width for buttons in training top nav to accomodate longer strings from translation

* commit 'b61c601b57cc2867500c7a6503e3a8dfdfbee229':
  provide more width for buttons in training top nav to accomodate longer strings from translation

11 years agoam 2452b062: am 0c81a130: provide more width for buttons in training top nav to accom...
Scott Main [Wed, 3 Oct 2012 03:42:29 +0000 (20:42 -0700)]
am 2452b062: am 0c81a130: provide more width for buttons in training top nav to accomodate longer strings from translation

* commit '2452b0625c18bb11a37eb9216078a83f41971240':
  provide more width for buttons in training top nav to accomodate longer strings from translation

11 years agoam 0c81a130: provide more width for buttons in training top nav to accomodate longer...
Scott Main [Wed, 3 Oct 2012 03:40:14 +0000 (20:40 -0700)]
am 0c81a130: provide more width for buttons in training top nav to accomodate longer strings from translation

* commit '0c81a130ef01981a0cbc3564c26658c51951812d':
  provide more width for buttons in training top nav to accomodate longer strings from translation

11 years agoprovide more width for buttons in training top nav to accomodate longer
Scott Main [Wed, 3 Oct 2012 03:36:45 +0000 (20:36 -0700)]
provide more width for buttons in training top nav to accomodate longer
strings from translation

Change-Id: Iaab2b30349943a236607d54394019fa8d89de800

11 years agoam bb179ed6: am cbefa644: am b649b416: am 235f4d4f: refactor the logic for changing...
Scott Main [Wed, 3 Oct 2012 03:36:01 +0000 (20:36 -0700)]
am bb179ed6: am cbefa644: am b649b416: am 235f4d4f: refactor the logic for changing languages in global strings. instead of using separate <span> elements for each language, provide a unique attribute in each <a> element for each localized version of that link\'s titl

* commit 'bb179ed6df88d435ba2f7271be50d1765aa8d637':
  refactor the logic for changing languages in global strings. instead of using separate <span> elements for each language, provide a unique attribute in each <a> element for each localized version of that link's title.

11 years agoam cbefa644: am b649b416: am 235f4d4f: refactor the logic for changing languages...
Scott Main [Wed, 3 Oct 2012 03:34:21 +0000 (20:34 -0700)]
am cbefa644: am b649b416: am 235f4d4f: refactor the logic for changing languages in global strings. instead of using separate <span> elements for each language, provide a unique attribute in each <a> element for each localized version of that link\'s title.

* commit 'cbefa6445e27092fba63b5d7567454e7cbf55144':
  refactor the logic for changing languages in global strings. instead of using separate <span> elements for each language, provide a unique attribute in each <a> element for each localized version of that link's title.

11 years agoam b649b416: am 235f4d4f: refactor the logic for changing languages in global strings...
Scott Main [Wed, 3 Oct 2012 03:32:11 +0000 (20:32 -0700)]
am b649b416: am 235f4d4f: refactor the logic for changing languages in global strings. instead of using separate <span> elements for each language, provide a unique attribute in each <a> element for each localized version of that link\'s title.

* commit 'b649b41604822cc0c9c32b3bc98233a8ab1148c9':
  refactor the logic for changing languages in global strings. instead of using separate <span> elements for each language, provide a unique attribute in each <a> element for each localized version of that link's title.

11 years agoam 235f4d4f: refactor the logic for changing languages in global strings. instead...
Scott Main [Wed, 3 Oct 2012 03:29:45 +0000 (20:29 -0700)]
am 235f4d4f: refactor the logic for changing languages in global strings. instead of using separate <span> elements for each language, provide a unique attribute in each <a> element for each localized version of that link\'s title.

* commit '235f4d4f8580a56d553e19c1beab1f8c22132e84':
  refactor the logic for changing languages in global strings. instead of using separate <span> elements for each language, provide a unique attribute in each <a> element for each localized version of that link's title.

11 years agorefactor the logic for changing languages in global strings.
Scott Main [Wed, 3 Oct 2012 00:12:23 +0000 (17:12 -0700)]
refactor the logic for changing languages in global strings.
instead of using separate <span> elements for each language,
provide a unique attribute in each <a> element for each localized
version of that link's title.

Change-Id: Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73

11 years agoam 672b1893: am 8c37f49f: Merge "Follow symlinks when using find"
Conley Owens [Tue, 2 Oct 2012 23:27:15 +0000 (16:27 -0700)]
am 672b1893: am 8c37f49f: Merge "Follow symlinks when using find"

* commit '672b1893688be170fad79dd35c41236d7c0e36c0':
  Follow symlinks when using find

11 years agoam 8c37f49f: Merge "Follow symlinks when using find"
Conley Owens [Tue, 2 Oct 2012 23:24:42 +0000 (16:24 -0700)]
am 8c37f49f: Merge "Follow symlinks when using find"

* commit '8c37f49fd02d00b6371fb808d9a9dc836f565e02':
  Follow symlinks when using find

11 years agoJOP02B
The Android Automerger [Tue, 2 Oct 2012 23:09:10 +0000 (16:09 -0700)]
JOP02B

11 years agoMerge "Follow symlinks when using find"
Conley Owens [Tue, 2 Oct 2012 23:06:41 +0000 (16:06 -0700)]
Merge "Follow symlinks when using find"

11 years agoam ca1ee0fd: am 817c0882: am 74811834: am dd3d3eea: add localize langs for global...
Scott Main [Tue, 2 Oct 2012 21:52:48 +0000 (14:52 -0700)]
am ca1ee0fd: am 817c0882: am 74811834: am dd3d3eea: add localize langs for global strings

* commit 'ca1ee0fdc15a54f8ea0e6b247fa3c80c96c7bc9a':
  add localize langs for global strings

11 years agoam d3ccfd53: am 5759dead: am a6c77d92: (-s ours) Reconcile with jb-mr0-release jb...
The Android Open Source Project [Tue, 2 Oct 2012 21:52:47 +0000 (14:52 -0700)]
am d3ccfd53: am 5759dead: am a6c77d92: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge

* commit 'd3ccfd53fe5c0bb4138b22acb818d567a4ca2466':
  JZO54K
  JRO03X

11 years agoam 817c0882: am 74811834: am dd3d3eea: add localize langs for global strings
Scott Main [Tue, 2 Oct 2012 21:51:19 +0000 (14:51 -0700)]
am 817c0882: am 74811834: am dd3d3eea: add localize langs for global strings

* commit '817c088203a947355b7e76ac6c19b4fbbb6a6bcc':
  add localize langs for global strings

11 years agoam 5759dead: am a6c77d92: (-s ours) Reconcile with jb-mr0-release jb-release - do...
The Android Open Source Project [Tue, 2 Oct 2012 21:51:18 +0000 (14:51 -0700)]
am 5759dead: am a6c77d92: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge

* commit '5759deadaad0b1055a703b11ed6509b8e46a0140':
  JZO54K
  JRO03X

11 years agoam 74811834: am dd3d3eea: add localize langs for global strings
Scott Main [Tue, 2 Oct 2012 21:49:07 +0000 (14:49 -0700)]
am 74811834: am dd3d3eea: add localize langs for global strings

* commit '748118343d76ed8b48c7b9ff48cbed8e2ab44ebb':
  add localize langs for global strings

11 years agoam a6c77d92: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge
The Android Open Source Project [Tue, 2 Oct 2012 21:49:06 +0000 (14:49 -0700)]
am a6c77d92: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge

* commit 'a6c77d92fcbc2a39758ab28c32b701025d637a7b':
  JZO54K
  JRO03X

11 years agoam dd3d3eea: add localize langs for global strings
Scott Main [Tue, 2 Oct 2012 21:47:52 +0000 (14:47 -0700)]
am dd3d3eea: add localize langs for global strings

* commit 'dd3d3eea1d953e4a174edb6e75cfdf0fcf03060f':
  add localize langs for global strings

11 years agoReconcile with jb-mr0-release jb-release - do not merge
The Android Open Source Project [Tue, 2 Oct 2012 21:47:23 +0000 (14:47 -0700)]
Reconcile with jb-mr0-release jb-release - do not merge

Change-Id: I4a96ee0e6bfce143dcf36ad1831f5fbe41965a83

11 years agoadd localize langs for global strings
Scott Main [Sat, 22 Sep 2012 03:32:56 +0000 (20:32 -0700)]
add localize langs for global strings

Change-Id: I90412e1e03a2676d927796187fe811481bf38455

11 years agoFollow symlinks when using find
Conley Owens [Tue, 2 Oct 2012 17:32:00 +0000 (10:32 -0700)]
Follow symlinks when using find

This allows more flexibility with symlinking subtrees within projects.
For example, a build bot with a read-only copy of the src can copy
directories which will be affected by applied patches while symlinking
to directories that will remain untouched.

Change-Id: I9c783180f3ebdd737d8daf17550f562e4f00b200

11 years agoJZO54K
The Android Automerger [Tue, 2 Oct 2012 20:59:47 +0000 (13:59 -0700)]
JZO54K

11 years agoReconcile with jb-mr1-release - do not merge
The Android Open Source Project [Tue, 2 Oct 2012 16:16:40 +0000 (09:16 -0700)]
Reconcile with jb-mr1-release - do not merge

Change-Id: Idf57d68a4ada6c27598df190a000f621bc15dcbf

11 years agoJOP02
The Android Automerger [Tue, 2 Oct 2012 14:01:18 +0000 (07:01 -0700)]
JOP02

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Tue, 2 Oct 2012 13:59:14 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoam 9acbbf12: am 76a6dc3a: Fix common typo in comments, warning and error messages.
Ian Rogers [Tue, 2 Oct 2012 00:26:02 +0000 (17:26 -0700)]
am 9acbbf12: am 76a6dc3a: Fix common typo in comments, warning and error messages.

* commit '9acbbf1267fc43bac61320a36dbf92edd00a357a':
  Fix common typo in comments, warning and error messages.

11 years agoam 76a6dc3a: Fix common typo in comments, warning and error messages.
Ian Rogers [Tue, 2 Oct 2012 00:23:57 +0000 (17:23 -0700)]
am 76a6dc3a: Fix common typo in comments, warning and error messages.

* commit '76a6dc3a191e8800211eb49398d37deae731094e':
  Fix common typo in comments, warning and error messages.

11 years agoFix common typo in comments, warning and error messages.
Ian Rogers [Mon, 1 Oct 2012 23:36:23 +0000 (16:36 -0700)]
Fix common typo in comments, warning and error messages.

s/can not/cannot/g

Change-Id: I1bac31157732666deb46f6f20389ff539977ffb9

11 years agoJOP01B
The Android Automerger [Mon, 1 Oct 2012 23:21:17 +0000 (16:21 -0700)]
JOP01B

11 years agoJOP01
The Android Automerger [Mon, 1 Oct 2012 14:00:00 +0000 (07:00 -0700)]
JOP01

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Mon, 1 Oct 2012 13:59:05 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoJOO92B
The Android Automerger [Mon, 1 Oct 2012 01:18:26 +0000 (18:18 -0700)]
JOO92B

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Mon, 1 Oct 2012 01:17:21 +0000 (18:17 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoJOO92
The Android Automerger [Sun, 30 Sep 2012 14:01:34 +0000 (07:01 -0700)]
JOO92

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Sun, 30 Sep 2012 13:59:16 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoMerge from jb-mr1-aah-dev
Jean-Baptiste Queru [Sat, 29 Sep 2012 00:07:43 +0000 (17:07 -0700)]
Merge from jb-mr1-aah-dev

Change-Id: Ifa8ee5e59bb3f61df4de47d52c062449bdea4911

11 years agoJRO03X
The Android Automerger [Fri, 28 Sep 2012 23:24:01 +0000 (16:24 -0700)]
JRO03X

11 years agoam 9eb2e010: Merge "Load only the current product config makefile." into jb-mr1-dev
Ying Wang [Fri, 28 Sep 2012 22:16:59 +0000 (15:16 -0700)]
am 9eb2e010: Merge "Load only the current product config makefile." into jb-mr1-dev

* commit '9eb2e010726039a9f38dc9dfda16487ba8a47eca':
  Load only the current product config makefile.

11 years agoam 9eb2e010: Merge "Load only the current product config makefile." into jb-mr1-dev
Ying Wang [Fri, 28 Sep 2012 22:15:46 +0000 (15:15 -0700)]
am 9eb2e010: Merge "Load only the current product config makefile." into jb-mr1-dev

* commit '9eb2e010726039a9f38dc9dfda16487ba8a47eca':
  Load only the current product config makefile.

11 years agoMerge "Load only the current product config makefile." into jb-mr1-dev
Ying Wang [Fri, 28 Sep 2012 22:11:10 +0000 (15:11 -0700)]
Merge "Load only the current product config makefile." into jb-mr1-dev

11 years agoLoad only the current product config makefile.
Ying Wang [Thu, 27 Sep 2012 20:26:25 +0000 (13:26 -0700)]
Load only the current product config makefile.

To reduce the start time.
With the change and previous change of doing clean step in only given paths,
start time of mm/mmm is reduced from ~5s to about 1s;
lunch time is reduced from ~40s to 3.5s.

Bug: 7186768,7169854
Change-Id: Ifd72ba1c6362a5e1125a23c505fd47947ab56675

11 years agoJOO90B
The Android Automerger [Fri, 28 Sep 2012 21:17:39 +0000 (14:17 -0700)]
JOO90B

11 years agoMerge from jb-mr1-aah-dev
Jean-Baptiste Queru [Fri, 28 Sep 2012 21:17:13 +0000 (14:17 -0700)]
Merge from jb-mr1-aah-dev

Change-Id: Ia884306cfe4a9389856be0f377351aacf4cb2e36

11 years agoam 1d55338d: (-s ours) am 91f71ca3: (-s ours) Reconcile with jb-mr0-release - do...
The Android Open Source Project [Fri, 28 Sep 2012 20:01:40 +0000 (13:01 -0700)]
am 1d55338d: (-s ours) am 91f71ca3: (-s ours) Reconcile with jb-mr0-release - do not merge

* commit '1d55338d613f0b4f4dd35de75d1a40de51a7bf31':
  JZO54J

11 years agoam 1d55338d: am 91f71ca3: (-s ours) Reconcile with jb-mr0-release - do not merge
The Android Open Source Project [Fri, 28 Sep 2012 20:01:29 +0000 (13:01 -0700)]
am 1d55338d: am 91f71ca3: (-s ours) Reconcile with jb-mr0-release - do not merge

* commit '1d55338d613f0b4f4dd35de75d1a40de51a7bf31':
  JZO54J

11 years agoam 91f71ca3: (-s ours) Reconcile with jb-mr0-release - do not merge
The Android Open Source Project [Fri, 28 Sep 2012 19:58:26 +0000 (12:58 -0700)]
am 91f71ca3: (-s ours) Reconcile with jb-mr0-release - do not merge

* commit '91f71ca30ffd88a1d90abb09d4a677f1a4a35938':
  JZO54J

11 years agoReconcile with jb-mr0-release - do not merge
The Android Open Source Project [Fri, 28 Sep 2012 19:52:59 +0000 (12:52 -0700)]
Reconcile with jb-mr0-release - do not merge

Change-Id: Ia64b2e21461cd8db90a733432dd859824950c211

11 years agoJZO54J
The Android Automerger [Fri, 28 Sep 2012 18:59:46 +0000 (11:59 -0700)]
JZO54J

11 years agoam f7592d98: Merge "Run clean steps in only given paths when using mm/mmm" into jb...
Ying Wang [Fri, 28 Sep 2012 17:26:32 +0000 (10:26 -0700)]
am f7592d98: Merge "Run clean steps in only given paths when using mm/mmm" into jb-mr1-dev

* commit 'f7592d987d38d434a4ad1f43607a2151dad2cd4f':
  Run clean steps in only given paths when using mm/mmm

11 years agoam f7592d98: Merge "Run clean steps in only given paths when using mm/mmm" into jb...
Ying Wang [Fri, 28 Sep 2012 17:25:43 +0000 (10:25 -0700)]
am f7592d98: Merge "Run clean steps in only given paths when using mm/mmm" into jb-mr1-dev

* commit 'f7592d987d38d434a4ad1f43607a2151dad2cd4f':
  Run clean steps in only given paths when using mm/mmm