OSDN Git Service
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
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.
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
The Android Automerger [Fri, 28 Sep 2012 23:24:01 +0000 (16:24 -0700)]
JRO03X
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.
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
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
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
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
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
The Android Automerger [Fri, 28 Sep 2012 18:59:46 +0000 (11:59 -0700)]
JZO54J
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
Ying Wang [Fri, 28 Sep 2012 17:24:40 +0000 (10:24 -0700)]
Merge "Run clean steps in only given paths when using mm/mmm" into jb-mr1-dev
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.
Bug:
7186768
Change-Id: I250e64256343afe788d79817af36eafaadb47028
Dianne Hackborn [Thu, 27 Sep 2012 23:28:13 +0000 (16:28 -0700)]
am
0bc03946: Look, up in the sky! It\'s a bird! It\'s a plane! It\'s Android 4.2 API 17!
* commit '
0bc03946889f04b333ec46ee4695a987ad7b4c0f':
Look, up in the sky! It's a bird! It's a plane! It's Android 4.2 API 17!
Dianne Hackborn [Thu, 27 Sep 2012 22:10:40 +0000 (15:10 -0700)]
Look, up in the sky! It's a bird! It's a plane! It's Android 4.2 API 17!
Change-Id: I577aa38525b23f297e3e2c4a745819ac87b24f6d
Dianne Hackborn [Wed, 26 Sep 2012 22:27:15 +0000 (15:27 -0700)]
am
edc24bb8: Merge "Make runhat command work again." into jb-mr1-dev
* commit '
edc24bb89c87d88c2da530812d64ae60d59a53e9':
Make runhat command work again.
Dianne Hackborn [Wed, 26 Sep 2012 22:25:22 +0000 (15:25 -0700)]
Merge "Make runhat command work again." into jb-mr1-dev
Dianne Hackborn [Wed, 26 Sep 2012 22:00:59 +0000 (15:00 -0700)]
Make runhat command work again.
Change-Id: Ia3d2aefd32579b61da72e65c78dc6053dbaaad28
The Android Open Source Project [Wed, 26 Sep 2012 16:02:14 +0000 (09:02 -0700)]
am
96b17f8e: (-s ours) am
a8a731bf: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '
96b17f8e9972cb69e2ae8ce9cb137ecc6ca7763a':
JZO54I
The Android Open Source Project [Wed, 26 Sep 2012 16:00:24 +0000 (09:00 -0700)]
am
a8a731bf: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '
a8a731bf7fe8d42af56c7481acd99628dd1df2f0':
JZO54I
The Android Open Source Project [Wed, 26 Sep 2012 15:58:17 +0000 (08:58 -0700)]
Reconcile with jb-mr0-release - do not merge
Change-Id: Ia744536ee9da563e661fdcd84defb22720d76309
The Android Automerger [Wed, 26 Sep 2012 04:50:16 +0000 (21:50 -0700)]
JZO54I
Bart Sears [Mon, 24 Sep 2012 20:08:21 +0000 (13:08 -0700)]
am
0b7e0983: Merge "Add the new NanumGothic makefile to the build" into jb-mr1-dev
* commit '
0b7e0983d4dab0796fd37439859250c88142463b':
Add the new NanumGothic makefile to the build
Bart Sears [Mon, 24 Sep 2012 20:06:06 +0000 (13:06 -0700)]
Merge "Add the new NanumGothic makefile to the build" into jb-mr1-dev
Siva Velusamy [Mon, 24 Sep 2012 19:49:27 +0000 (12:49 -0700)]
am
53e71420: Revert "Include videoeditor_jni in sdk product build."
* commit '
53e714209b32599a1fe19a1827f313207e43fd52':
Revert "Include videoeditor_jni in sdk product build."
Siva Velusamy [Fri, 21 Sep 2012 22:23:58 +0000 (15:23 -0700)]
Revert "Include videoeditor_jni in sdk product build."
This reverts commit
997e629d6dca5683af596ba22f564b5346967b95.
The Android Open Source Project [Mon, 24 Sep 2012 15:51:29 +0000 (08:51 -0700)]
am
cc71f1ea: (-s ours) am
d50926a0: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '
cc71f1ea0b090903ea0c9a5b71b1a440c26de101':
JZO54H
Ying Wang [Mon, 24 Sep 2012 15:27:35 +0000 (08:27 -0700)]
am
f8f2b022: Ignore support library Proguard warning
* commit '
f8f2b022e9e6ea218d60eb692ede3e6e48c944af':
Ignore support library Proguard warning
The Android Open Source Project [Mon, 24 Sep 2012 15:26:41 +0000 (08:26 -0700)]
am
d50926a0: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '
d50926a047d51f950cbe6c7588d4b168e0cfc3bb':
JZO54H
The Android Open Source Project [Mon, 24 Sep 2012 14:38:53 +0000 (07:38 -0700)]
Reconcile with jb-mr0-release - do not merge
Change-Id: I41bb7c5875f0eef1fd8c31f98f628718a966eddc
Bart Sears [Mon, 24 Sep 2012 07:11:00 +0000 (00:11 -0700)]
Add the new NanumGothic makefile to the build
There are separate CLs to add the NanumGothic font files
and makefiles.
Bug:
4531601
Change-Id: Id27f9ff6eb45f666f7f62f1dbe7a06c96c0a717e
Ying Wang [Sun, 23 Sep 2012 20:46:58 +0000 (13:46 -0700)]
Ignore support library Proguard warning
The support library contains references to newer platform versions.
Don't warn about those in case this app is linking against an older
platform version. We know about them, and they are safe.
Change-Id: Ia2a90398b1db1858d005ec09ded56751cc6ffb00
The Android Automerger [Sat, 22 Sep 2012 01:02:14 +0000 (18:02 -0700)]
JZO54H
Siva Velusamy [Sat, 22 Sep 2012 00:48:35 +0000 (17:48 -0700)]
am
32130c6d: Merge "Include videoeditor_jni in sdk product build." into jb-mr1-dev
* commit '
32130c6d092223ba91ab4425fe2c40e9e6fde584':
Include videoeditor_jni in sdk product build.
Scott Main [Sat, 22 Sep 2012 00:48:34 +0000 (17:48 -0700)]
am
57a0a4c1: am
dcce7ca6: am
582db97b: add style for code captions; ignore sidenav headers for HRs
* commit '
57a0a4c1fe29a2fe5fea924bd87554380bc70a9a':
add style for code captions; ignore sidenav headers for HRs
Siva Velusamy [Fri, 21 Sep 2012 22:00:27 +0000 (15:00 -0700)]
Merge "Include videoeditor_jni in sdk product build." into jb-mr1-dev