Christopher Ferris
161e0ef974
Merge "Adding TARGET_CPU_VARIANT to config file."
2013-03-08 02:18:08 +00:00
Christopher Ferris
6103fd7ac3
Adding TARGET_CPU_VARIANT to config file.
...
Adding this since all arm builds will require TARGET_CPU_VARIANT
to be set to a valid value in the near future.
Merge from internal master.
Change-Id: I2b73f9dbdd04cd8ac47035875c714bd0e75920e7
2013-03-07 18:12:50 -08:00
Ying Wang
4781e30a96
resolved conflicts for merge of de949b11 to jb-mr2-dev
...
Change-Id: I5a4c8cefeaf9e2f27be4b7ed8e4b30cb5a83a2f5
2013-03-07 18:00:03 -08:00
Ying Wang
de949b11af
am 671d90ea: Merge "Add module names to emulator PRODUCT_PACKAGES."
...
* commit '671d90ea1d20312df60b700748d49dac17054099':
Add module names to emulator PRODUCT_PACKAGES.
2013-03-07 17:49:44 -08:00
Ying Wang
671d90ea1d
Merge "Add module names to emulator PRODUCT_PACKAGES."
2013-03-08 01:15:00 +00:00
Tim Murray
c08eceee8e
Merge "Add support for multiple architectures with RS compat lib." into jb-mr2-dev
2013-03-07 23:34:11 +00:00
Doug Zongker
07e9fbb241
Merge "recovery: choose between available fonts based on device density" into jb-mr2-dev
2013-03-07 22:34:00 +00:00
Justin Ho
49ffc52074
Merge "Add fr_CA to l10n builds Bug: 7579865" into jb-mr2-dev
2013-03-07 20:34:22 +00:00
Justin Ho
d082d6730d
Add fr_CA to l10n builds
...
Bug: 7579865
Change-Id: I92c1368b97ced96cacc560d829707b9b7de69ef4
2013-03-07 12:27:44 -08:00
Scott Main
6fa3463b2f
am e2b31818: am 5b654685: am 7b21b887: am 3797ec57: am 288099b2: am a07be8ee: switch code font to pure monospace (sans serif). also add proper margins for elements nested in lists
...
* commit 'e2b31818d6b5c27de1cbebaeb3ca5362c5ab1f9a':
2013-03-07 12:21:27 -08:00
Scott Main
ac9e2c3063
am 43403d90: am 774274d0: am a8a80d78: am 5a0e36fe: am 415696d3: am f8333457: Revert "docs: move loading of google ref into doc load event to prevent error during load"
...
* commit '43403d905a65e21ec12ec3f6c64d566e7fe7a35f':
2013-03-07 12:21:26 -08:00
Scott Main
332cd4bab0
am a525786f: am c4f84cbb: am 6f0172c4: am e99ca7ae: am 2990dc10: am 578d6446: docs: move loading of google ref into doc load event to prevent error during load
...
* commit 'a525786f825389565314361e3255bfd3d713c9a3':
2013-03-07 12:21:26 -08:00
Jean-Baptiste Queru
69d530f81e
am c26c52a6: am e47881e6: am f8372271: (-s ours) am 17cbfdda: (-s ours) am 76bbd39a: (-s ours) am 22c22cf7: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'c26c52a6a0d097e2e28804347d8b0ada758109fa':
2013-03-07 12:21:25 -08:00
Scott Main
bbdb87dbf5
am aaf22c8d: am 70e053fb: am f6c979e0: am bfeae36e: am 68510e25: am 9f2971d1: docs: fix suggestions due to file name change for js files
...
* commit 'aaf22c8dd864c9bb8944106d4196969e950d2163':
2013-03-07 12:21:24 -08:00
Scott Main
df16b69845
am fc3a4e31: am 7c1cde1d: am 1cccea9b: am cdf32e84: am e892c86e: am 7e447edf: docs: update search suggest with google services apis including some optimizations for loading javascript resources
...
* commit 'fc3a4e31edb22e0f908bdf8b73a0ce58abf1b9c2':
2013-03-07 12:21:24 -08:00
Ken Sumrall
3217eca0d7
am 639225d7: am fa84cfd1: am f1a6ba57: am 4c5b0bf4: am 8d3e1e55: am 44281a1f: Add unified fstab support to release tools
...
* commit '639225d73a63de49aa73d08d9dd93dfec86c9886':
2013-03-07 12:21:23 -08:00
Scott Main
d20108785c
am fc307571: am 49711e2c: am 3707041b: am d3622632: am 8ced7e63: am d6cb8fac: docs: fix padding for left-figure class
...
* commit 'fc307571e9f20fcdd1930c26e54adb54d999fa0a':
2013-03-07 12:21:23 -08:00
Scott Main
d411968776
am d1fa8591: am 9ae44c9d: am 589b4b3e: am 956d4c70: am 373318ca: am 0e69c3e4: Merge "docs: add image frame style and left-float figure box" into jb-mr1-dev
...
* commit 'd1fa85916dd2066fc1030682ecfd75639804bd1f':
2013-03-07 12:21:22 -08:00
Robert Ly
2f5cdf9031
am 9ac8c78d: am dfc239ce: am e28696da: am 116c59bb: am cef5be2d: am dae7b523: Revert "support differently named lists.js files"
...
* commit '9ac8c78dfee09a6d9769e1fac024fee08070e3b7':
2013-03-07 12:21:21 -08:00
Scott Main
b8b3406e6a
am 50e9bdd0: am c8141407: am 40741e48: am 4cc2bc77: am a07be8ee: switch code font to pure monospace (sans serif). also add proper margins for elements nested in lists
...
* commit '50e9bdd0a4f3ef75ea7b76c553422fbaf72c7256':
switch code font to pure monospace (sans serif). also add proper margins for elements nested in lists
2013-03-07 12:21:21 -08:00
Scott Main
e2b31818d6
am 5b654685: am 7b21b887: am 3797ec57: am 288099b2: am a07be8ee: switch code font to pure monospace (sans serif). also add proper margins for elements nested in lists
...
* commit '5b654685c08f51c94a0d269831228632cf6b281c':
2013-03-07 11:49:23 -08:00
Scott Main
43403d905a
am 774274d0: am a8a80d78: am 5a0e36fe: am 415696d3: am f8333457: Revert "docs: move loading of google ref into doc load event to prevent error during load"
...
* commit '774274d0e6ab8fa7218033cf1d058f6b6de2149c':
2013-03-07 11:49:22 -08:00
Scott Main
a525786f82
am c4f84cbb: am 6f0172c4: am e99ca7ae: am 2990dc10: am 578d6446: docs: move loading of google ref into doc load event to prevent error during load
...
* commit 'c4f84cbb933e23fe176d5909a294d54cbfa315b0':
2013-03-07 11:49:22 -08:00
Jean-Baptiste Queru
c26c52a6a0
am e47881e6: am f8372271: (-s ours) am 17cbfdda: (-s ours) am 76bbd39a: (-s ours) am 22c22cf7: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'e47881e655a687a7132af6647b8bcc2fdc784714':
2013-03-07 11:49:21 -08:00
Scott Main
aaf22c8dd8
am 70e053fb: am f6c979e0: am bfeae36e: am 68510e25: am 9f2971d1: docs: fix suggestions due to file name change for js files
...
* commit '70e053fbdcae0fcfd684409f957bd7e6734c4827':
2013-03-07 11:49:20 -08:00
Scott Main
fc3a4e31ed
am 7c1cde1d: am 1cccea9b: am cdf32e84: am e892c86e: am 7e447edf: docs: update search suggest with google services apis including some optimizations for loading javascript resources
...
* commit '7c1cde1d90108c3fdd15c38e17f72fc5ca09e6e1':
2013-03-07 11:49:20 -08:00
Ken Sumrall
639225d73a
am fa84cfd1: am f1a6ba57: am 4c5b0bf4: am 8d3e1e55: am 44281a1f: Add unified fstab support to release tools
...
* commit 'fa84cfd18161df6631af7c1b2be96b4ec3ee7174':
2013-03-07 11:49:19 -08:00
Scott Main
fc307571e9
am 49711e2c: am 3707041b: am d3622632: am 8ced7e63: am d6cb8fac: docs: fix padding for left-figure class
...
* commit '49711e2c04c9a35d536f7ba3a3174afc9a1eca23':
2013-03-07 11:49:19 -08:00
Scott Main
d1fa85916d
am 9ae44c9d: am 589b4b3e: am 956d4c70: am 373318ca: am 0e69c3e4: Merge "docs: add image frame style and left-float figure box" into jb-mr1-dev
...
* commit '9ae44c9da7966c2f43d5e22871a65a16cf10b4cc':
2013-03-07 11:49:18 -08:00
Robert Ly
9ac8c78dfe
am dfc239ce: am e28696da: am 116c59bb: am cef5be2d: am dae7b523: Revert "support differently named lists.js files"
...
* commit 'dfc239ce8692b542048670927bf7d46d9527d32f':
2013-03-07 11:49:18 -08:00
Scott Main
50e9bdd0a4
am c8141407: am 40741e48: am 4cc2bc77: am a07be8ee: switch code font to pure monospace (sans serif). also add proper margins for elements nested in lists
...
* commit 'c8141407eff4577abae3740bb2a6abf881c6c17c':
switch code font to pure monospace (sans serif). also add proper margins for elements nested in lists
2013-03-07 11:49:17 -08:00
Scott Main
5b654685c0
am 7b21b887: am 3797ec57: am 288099b2: am a07be8ee: switch code font to pure monospace (sans serif). also add proper margins for elements nested in lists
...
* commit '7b21b8873f7c511203779710f5791b1b7692f082':
2013-03-07 11:45:38 -08:00
Scott Main
774274d0e6
am a8a80d78: am 5a0e36fe: am 415696d3: am f8333457: Revert "docs: move loading of google ref into doc load event to prevent error during load"
...
* commit 'a8a80d78e7a94f6981d2f5916ca9b6e944be8a14':
2013-03-07 11:45:38 -08:00
Scott Main
c4f84cbb93
am 6f0172c4: am e99ca7ae: am 2990dc10: am 578d6446: docs: move loading of google ref into doc load event to prevent error during load
...
* commit '6f0172c4140ac0d3de2ceadc93e6e10b4b8ef051':
2013-03-07 11:45:37 -08:00
Jean-Baptiste Queru
e47881e655
am f8372271: (-s ours) am 17cbfdda: (-s ours) am 76bbd39a: (-s ours) am 22c22cf7: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'f83722715237d0e80297e7d22ee5dd79d0624fe7':
2013-03-07 11:45:36 -08:00
Scott Main
70e053fbdc
am f6c979e0: am bfeae36e: am 68510e25: am 9f2971d1: docs: fix suggestions due to file name change for js files
...
* commit 'f6c979e03f0ac1748e5fbf8ed689b2e0c031e64a':
2013-03-07 11:45:35 -08:00
Scott Main
7c1cde1d90
am 1cccea9b: am cdf32e84: am e892c86e: am 7e447edf: docs: update search suggest with google services apis including some optimizations for loading javascript resources
...
* commit '1cccea9b400a93d6154158c6167619a3a10c8998':
2013-03-07 11:45:34 -08:00
Ken Sumrall
fa84cfd181
am f1a6ba57: am 4c5b0bf4: am 8d3e1e55: am 44281a1f: Add unified fstab support to release tools
...
* commit 'f1a6ba578967277b351b646755132eea3c87240a':
2013-03-07 11:45:33 -08:00
Scott Main
49711e2c04
am 3707041b: am d3622632: am 8ced7e63: am d6cb8fac: docs: fix padding for left-figure class
...
* commit '3707041ba7f638e510c5300170f0a09fceb8d81e':
2013-03-07 11:45:32 -08:00
Scott Main
9ae44c9da7
am 589b4b3e: am 956d4c70: am 373318ca: am 0e69c3e4: Merge "docs: add image frame style and left-float figure box" into jb-mr1-dev
...
* commit '589b4b3ea983aab1825cb1aea24d072a4a757b70':
2013-03-07 11:45:32 -08:00
Robert Ly
dfc239ce86
am e28696da: am 116c59bb: am cef5be2d: am dae7b523: Revert "support differently named lists.js files"
...
* commit 'e28696da0ab977dbf4823c2e5a4d1355fe516a32':
2013-03-07 11:45:31 -08:00
Scott Main
c8141407ef
am 40741e48: am 4cc2bc77: am a07be8ee: switch code font to pure monospace (sans serif). also add proper margins for elements nested in lists
...
* commit '40741e48984d2c3173378f4aa497d2e848e74e7a':
switch code font to pure monospace (sans serif). also add proper margins for elements nested in lists
2013-03-07 11:45:31 -08:00
Scott Main
7b21b8873f
am 3797ec57: am 288099b2: am a07be8ee: switch code font to pure monospace (sans serif). also add proper margins for elements nested in lists
...
* commit '3797ec576e436c5c5a4991eeca85be0ef21ff173':
2013-03-07 11:42:45 -08:00
Scott Main
a8a80d78e7
am 5a0e36fe: am 415696d3: am f8333457: Revert "docs: move loading of google ref into doc load event to prevent error during load"
...
* commit '5a0e36fe69bda665b4c4d5aaa3c1f4de57bf883c':
2013-03-07 11:42:45 -08:00
Scott Main
6f0172c414
am e99ca7ae: am 2990dc10: am 578d6446: docs: move loading of google ref into doc load event to prevent error during load
...
* commit 'e99ca7ae6d60761c7d80d4a3bddc018fb16952b4':
2013-03-07 11:42:44 -08:00
Jean-Baptiste Queru
f837227152
am 17cbfdda: (-s ours) am 76bbd39a: (-s ours) am 22c22cf7: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '17cbfdda28584c5e5fbf67237b8250a1e48e77bd':
2013-03-07 11:42:43 -08:00
Scott Main
f6c979e03f
am bfeae36e: am 68510e25: am 9f2971d1: docs: fix suggestions due to file name change for js files
...
* commit 'bfeae36ec422e9ee5e75f521e5e0f73787ed0010':
2013-03-07 11:42:43 -08:00
Scott Main
1cccea9b40
am cdf32e84: am e892c86e: am 7e447edf: docs: update search suggest with google services apis including some optimizations for loading javascript resources
...
* commit 'cdf32e840136c7d6357e1ebf8b9c248c889b0011':
2013-03-07 11:42:42 -08:00
Ken Sumrall
f1a6ba5789
am 4c5b0bf4: am 8d3e1e55: am 44281a1f: Add unified fstab support to release tools
...
* commit '4c5b0bf4b8acbe56fa80b8a69b5de3a48701d8df':
2013-03-07 11:42:42 -08:00
Scott Main
3707041ba7
am d3622632: am 8ced7e63: am d6cb8fac: docs: fix padding for left-figure class
...
* commit 'd3622632fa1c0fea56eb3bb927d9cff43996c9d9':
2013-03-07 11:42:41 -08:00
