OSDN Git Service
Dirk Dougherty [Wed, 24 Oct 2012 20:42:41 +0000 (13:42 -0700)]
am
db9ad2da: am
80ebbc3c: am
1a13c317: am
a4375a19: Merge "Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*." into jb-dev-docs
* commit '
db9ad2da9efbd5aa614f72a820edf6c1b1cfaf4b':
Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*.
Dirk Dougherty [Wed, 24 Oct 2012 20:39:55 +0000 (13:39 -0700)]
am
80ebbc3c: am
1a13c317: am
a4375a19: Merge "Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*." into jb-dev-docs
* commit '
80ebbc3c5fde6d653c92a0288e1967f519b9c9ef':
Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*.
Dirk Dougherty [Wed, 24 Oct 2012 20:38:19 +0000 (13:38 -0700)]
am
1a13c317: am
a4375a19: Merge "Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*." into jb-dev-docs
* commit '
1a13c317627996234a1dfa2c0736733bd1c4c696':
Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*.
Dirk Dougherty [Wed, 24 Oct 2012 20:35:53 +0000 (13:35 -0700)]
am
a4375a19: Merge "Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*." into jb-dev-docs
* commit '
a4375a19c6ff958d33d62ee96f6ccdde223b0c7a':
Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*.
Dirk Dougherty [Wed, 24 Oct 2012 20:33:39 +0000 (13:33 -0700)]
Merge "Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*." into jb-dev-docs
Scott Main [Tue, 23 Oct 2012 03:40:31 +0000 (20:40 -0700)]
am
bd027cd4: am
ab84504b: am
6613a232: am
0e585706: fix spacing in carousel text for Develop homepage
* commit '
bd027cd4e79b281dc414e170ada4f92bd580dbf0':
fix spacing in carousel text for Develop homepage
Scott Main [Tue, 23 Oct 2012 03:37:56 +0000 (20:37 -0700)]
am
ab84504b: am
6613a232: am
0e585706: fix spacing in carousel text for Develop homepage
* commit '
ab84504b8a9e24b15af916faa95dcf65685a22a3':
fix spacing in carousel text for Develop homepage
Scott Main [Tue, 23 Oct 2012 03:35:42 +0000 (20:35 -0700)]
am
6613a232: am
0e585706: fix spacing in carousel text for Develop homepage
* commit '
6613a2327512f3742d55cf0eb79fc4d52cf9a7cb':
fix spacing in carousel text for Develop homepage
Scott Main [Tue, 23 Oct 2012 03:33:41 +0000 (20:33 -0700)]
am
0e585706: fix spacing in carousel text for Develop homepage
* commit '
0e585706f0199f9d277e0d099ece682a2ee502ef':
fix spacing in carousel text for Develop homepage
Scott Main [Tue, 23 Oct 2012 03:30:22 +0000 (20:30 -0700)]
fix spacing in carousel text for Develop homepage
Change-Id: If8f95e66b4c1b4918b0d1dea59241d5a17acbfd9
Joe Onorato [Fri, 19 Oct 2012 19:04:55 +0000 (12:04 -0700)]
make packages respect LOCAL_ADDITIONAL_DEPENDENCIES
Change-Id: I2595040f77f8ebb4d7c89140394a6060f167aee5
Joe Onorato [Mon, 31 Oct 2011 04:37:35 +0000 (21:37 -0700)]
Add a tool to let you enforce layering between packages in a java module.
And build system support for it too.
Change-Id: I4dd5ed0b9edab6e8884b0d00cfeeae5fa38d967a
Dirk Dougherty [Sun, 14 Oct 2012 00:32:23 +0000 (17:32 -0700)]
Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*.
Change-Id: I5a14bae715187c3d9307b39394f1b53d4fed39dd
Guang Zhu [Sat, 13 Oct 2012 00:06:21 +0000 (17:06 -0700)]
am
18daa175: Merge "DO NOT MERGE: better late than never: fix build id for JB MR1" into jb-mr1-dev
* commit '
18daa1750ba31b510d07d0f65e8e8007ed90b902':
DO NOT MERGE: better late than never: fix build id for JB MR1
Guang Zhu [Sat, 13 Oct 2012 00:04:57 +0000 (17:04 -0700)]
Merge "DO NOT MERGE: better late than never: fix build id for JB MR1" into jb-mr1-dev
Ying Wang [Fri, 12 Oct 2012 01:03:22 +0000 (18:03 -0700)]
am
abc9d6f2: Merge "Delete the unused LOCAL_POST_PROCESS_COMMAND." into jb-mr1-dev
* commit '
abc9d6f2beca88dbd0ec021d343c68f4b617216d':
Delete the unused LOCAL_POST_PROCESS_COMMAND.
Ying Wang [Fri, 12 Oct 2012 01:01:17 +0000 (18:01 -0700)]
Merge "Delete the unused LOCAL_POST_PROCESS_COMMAND." into jb-mr1-dev
Joe Onorato [Wed, 10 Oct 2012 02:39:43 +0000 (19:39 -0700)]
Respect LOCAL_ADDITIONAL_DEPENDENCIES for host java libraries.
(makes generating code easier)
Change-Id: I1e2e882f7805dbfe4b726955eddc5ff8bc3e0005
Stephen Hines [Fri, 12 Oct 2012 00:27:30 +0000 (17:27 -0700)]
am
0a0cfe95: Merge "Add support for building Filterscript files." into jb-mr1-dev
* commit '
0a0cfe95ac50457fe5539f913b372880ef841880':
Add support for building Filterscript files.
Ying Wang [Fri, 12 Oct 2012 00:26:07 +0000 (17:26 -0700)]
Delete the unused LOCAL_POST_PROCESS_COMMAND.
Change-Id: I77785dff6c7b2236880232522d6ed5bc01d5f0ce
Stephen Hines [Fri, 12 Oct 2012 00:25:20 +0000 (17:25 -0700)]
Merge "Add support for building Filterscript files." into jb-mr1-dev
Dirk Dougherty [Thu, 11 Oct 2012 23:59:11 +0000 (16:59 -0700)]
am
afc782da: am
77b10b6a: am
e37b7a52: am
8f20607c: Doc change: add new items to qv and adjust height.
* commit '
afc782da46760e7f70df8fefc395b13e29933c5b':
Doc change: add new items to qv and adjust height.
Dirk Dougherty [Thu, 11 Oct 2012 23:57:43 +0000 (16:57 -0700)]
am
77b10b6a: am
e37b7a52: am
8f20607c: Doc change: add new items to qv and adjust height.
* commit '
77b10b6a78f8ef77e2d5bbb3cb650f953c642527':
Doc change: add new items to qv and adjust height.
Dirk Dougherty [Thu, 11 Oct 2012 22:33:05 +0000 (15:33 -0700)]
am
e37b7a52: am
8f20607c: Doc change: add new items to qv and adjust height.
* commit '
e37b7a52abb488f853fefa1a13eec1b5c20844a6':
Doc change: add new items to qv and adjust height.
Dirk Dougherty [Thu, 11 Oct 2012 22:31:29 +0000 (15:31 -0700)]
am
8f20607c: Doc change: add new items to qv and adjust height.
* commit '
8f20607ccb9c41469eec8f1f481d8d841bbeb2a1':
Doc change: add new items to qv and adjust height.
Dirk Dougherty [Mon, 8 Oct 2012 20:14:17 +0000 (13:14 -0700)]
Doc change: add new items to qv and adjust height.
Change-Id: I246c36e0aabb32264325e0943aed127419da2a73
Stephen Hines [Thu, 11 Oct 2012 22:01:53 +0000 (15:01 -0700)]
Add support for building Filterscript files.
This change piggybacks Filterscript rules onto the existing Renderscript
rules. There is no real difference other than the file extension (which
llvm-rs-cc uses to apply a more stringent set of warnings/errors).
Bug:
7166741
Change-Id: I27175ff1c16c27129cafa92b4e8caabf2e5f4150
Ying Wang [Thu, 11 Oct 2012 22:15:47 +0000 (15:15 -0700)]
am
11b15b15: Resovle symlink in findmakefiles in envsetup.sh
* commit '
11b15b15ce69b2d0b88080888865ed9f590a18fd':
Resovle symlink in findmakefiles in envsetup.sh
Ying Wang [Thu, 11 Oct 2012 22:05:07 +0000 (15:05 -0700)]
Resovle symlink in findmakefiles in envsetup.sh
So the returned path can match the one returned by gettop,
and so we can get the correct relative path of ONE_SHOT_MAKEFILE when running mm.
Change-Id: I492d68fec47e59ec9f4ea0fb5139b1a28af0f6cd
Ying Wang [Thu, 11 Oct 2012 19:58:27 +0000 (12:58 -0700)]
am
72405497: Convert to relative path for CleanSpec.mk
* commit '
7240549748fd4e4879009524a6d01a4c26294568':
Convert to relative path for CleanSpec.mk
Ying Wang [Thu, 11 Oct 2012 18:53:04 +0000 (11:53 -0700)]
Convert to relative path for CleanSpec.mk
When using mm, which passes in absolute path, while in full build relative
paths are used to encode clean steps.
Change-Id: I3e39ce3125194589f9a464f27eef4a9c96fa06c1
Christopher Tate [Wed, 10 Oct 2012 22:37:23 +0000 (15:37 -0700)]
am
fd671b2d: Merge "Add the new \'settings\' shell tool to the build" into jb-mr1-dev
* commit '
fd671b2d5feb158fbcf6598ec1ae8d0654c70c35':
Add the new 'settings' shell tool to the build
Christopher Tate [Wed, 10 Oct 2012 22:35:00 +0000 (15:35 -0700)]
Merge "Add the new 'settings' shell tool to the build" into jb-mr1-dev
Christopher Tate [Wed, 10 Oct 2012 21:13:59 +0000 (14:13 -0700)]
Add the new 'settings' shell tool to the build
The tool isn't useful unless it's actually built into products.
Bug
7299066
Change-Id: I9aaf37bde73a986d871eac6fd4dea15c192110cb
Ying Wang [Wed, 10 Oct 2012 20:51:29 +0000 (13:51 -0700)]
am
57ddcb1b: Support to build executables against the NDK
* commit '
57ddcb1bbce7a980e677dfd212ce76229fe33f55':
Support to build executables against the NDK
Ying Wang [Wed, 26 Sep 2012 00:52:10 +0000 (17:52 -0700)]
Support to build executables against the NDK
Use "LOCAL_SDK_VERSION := <number>" to build against the NDK when you
include $(BUILD_EXECUTABLE).
Cherry-picked from master.
Bug:
7170098
Change-Id: Ib35a294bd6aa4e969d46ecd8ebab8ca5d843e24b
Guang Zhu [Wed, 10 Oct 2012 01:39:40 +0000 (18:39 -0700)]
DO NOT MERGE: better late than never: fix build id for JB MR1
Change-Id: Iaad3002693af683f719832d3c082e7e4dcbf8d29
Scott Main [Mon, 8 Oct 2012 23:09:06 +0000 (16:09 -0700)]
am
d73053a8: am
b282c359: am
126c5e92: am
e6850d2d: fix layout bug on API Guide landing pages
* commit '
d73053a814260cb4a31a8a38727bbb6fc6f10946':
fix layout bug on API Guide landing pages
Scott Main [Mon, 8 Oct 2012 23:06:43 +0000 (16:06 -0700)]
am
b282c359: am
126c5e92: am
e6850d2d: fix layout bug on API Guide landing pages
* commit '
b282c359fcbde7f36b579cde388ca044a0dd6d60':
fix layout bug on API Guide landing pages
Scott Main [Mon, 8 Oct 2012 23:04:25 +0000 (16:04 -0700)]
am
126c5e92: am
e6850d2d: fix layout bug on API Guide landing pages
* commit '
126c5e9205263f097af4d0f9dca3b10c9a02d72b':
fix layout bug on API Guide landing pages
Scott Main [Mon, 8 Oct 2012 23:02:05 +0000 (16:02 -0700)]
am
e6850d2d: fix layout bug on API Guide landing pages
* commit '
e6850d2db787a4e268b5cee57d74e9308180a589':
fix layout bug on API Guide landing pages
Scott Main [Mon, 8 Oct 2012 22:59:01 +0000 (15:59 -0700)]
fix layout bug on API Guide landing pages
Change-Id: Ic757d26c29cd06c33dc62816698b68a9b5fe869a
Ying Wang [Wed, 26 Sep 2012 00:52:10 +0000 (17:52 -0700)]
Support to build executables against the NDK
Use "LOCAL_SDK_VERSION := <number>" to build against the NDK when you
include $(BUILD_EXECUTABLE).
Bug:
7170098
Change-Id: I4cebeae3355e79a4d2f2f5549ef0613ced77e3f0
Keun young Park [Fri, 5 Oct 2012 21:28:05 +0000 (14:28 -0700)]
am
f6e6bf7e: add mip32 stuffs to clang\'s unknown flag list
* commit '
f6e6bf7edf03b7f38f5452cc0749b705eb3a6ada':
add mip32 stuffs to clang's unknown flag list
Keun young Park [Fri, 5 Oct 2012 20:26:19 +0000 (13:26 -0700)]
add mip32 stuffs to clang's unknown flag list
- mini_mips changed to mips32-fp to accomodate all mips variants
Bug:
7294949
Change-Id: Iae759e10e3f5d255e27b688042477263438bb7a7
Ying Wang [Thu, 4 Oct 2012 17:02:38 +0000 (10:02 -0700)]
am
af4299c5: Merge "Store vendor module owner info on the build server." into jb-mr1-dev
* commit '
af4299c56d57de8c274889305b62280bcdf9a672':
Store vendor module owner info on the build server.
Ying Wang [Thu, 4 Oct 2012 17:01:14 +0000 (10:01 -0700)]
Merge "Store vendor module owner info on the build server." into jb-mr1-dev
Ying Wang [Wed, 3 Oct 2012 22:22:51 +0000 (15:22 -0700)]
Store vendor module owner info on the build server.
Bug:
7048854
Change-Id: I5f0653c71a77774978655f8b5570e170b4a9c4ec
Scott Main [Thu, 4 Oct 2012 00:43:46 +0000 (17:43 -0700)]
am
be1df522: am
ded6dc01: am
86028756: am
46c5804c: add analytics tracking event for sdk/ndk downloads
* commit '
be1df522a98f3fc38a5d133c32c48df44f36e605':
add analytics tracking event for sdk/ndk downloads
Scott Main [Thu, 4 Oct 2012 00:41:59 +0000 (17:41 -0700)]
am
ded6dc01: am
86028756: am
46c5804c: add analytics tracking event for sdk/ndk downloads
* commit '
ded6dc0137fb0632f9de47870fb923567ea22b17':
add analytics tracking event for sdk/ndk downloads
Scott Main [Thu, 4 Oct 2012 00:40:45 +0000 (17:40 -0700)]
am
86028756: am
46c5804c: add analytics tracking event for sdk/ndk downloads
* commit '
860287560db20e6f46a282284d8a04d5e001d2ea':
add analytics tracking event for sdk/ndk downloads
Scott Main [Thu, 4 Oct 2012 00:38:56 +0000 (17:38 -0700)]
am
46c5804c: add analytics tracking event for sdk/ndk downloads
* commit '
46c5804c47e02206a4c97c0890991c2d3bff87bf':
add analytics tracking event for sdk/ndk downloads
Scott Main [Wed, 3 Oct 2012 23:34:52 +0000 (16:34 -0700)]
add analytics tracking event for sdk/ndk downloads
Change-Id: Icb04694ef9498ae684350ad4a971fb23d0301605
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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.
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.
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.
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
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
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
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
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
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
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
Scott Main [Sat, 22 Sep 2012 03:32:56 +0000 (20:32 -0700)]
add localize langs for global strings
Change-Id: I90412e1e03a2676d927796187fe811481bf38455
The Android Automerger [Tue, 2 Oct 2012 20:59:47 +0000 (13:59 -0700)]
JZO54K
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.