The Android Automerger
ada6ef0ec1
JOP08B
2012-10-08 16:08:35 -07:00
Scott Main
d73053a814
am b282c359
: am 126c5e92
: am e6850d2d
: fix layout bug on API Guide landing pages
...
* commit 'b282c359fcbde7f36b579cde388ca044a0dd6d60':
fix layout bug on API Guide landing pages
2012-10-08 16:06:43 -07:00
Scott Main
b282c359fc
am 126c5e92
: am e6850d2d
: fix layout bug on API Guide landing pages
...
* commit '126c5e9205263f097af4d0f9dca3b10c9a02d72b':
fix layout bug on API Guide landing pages
2012-10-08 16:04:25 -07:00
Scott Main
126c5e9205
am e6850d2d
: fix layout bug on API Guide landing pages
...
* commit 'e6850d2db787a4e268b5cee57d74e9308180a589':
fix layout bug on API Guide landing pages
2012-10-08 16:02:05 -07:00
Scott Main
e6850d2db7
fix layout bug on API Guide landing pages
...
Change-Id: Ic757d26c29cd06c33dc62816698b68a9b5fe869a
2012-10-08 15:59:01 -07:00
The Android Automerger
8a2f6e55ca
JOP08
2012-10-08 07:00:04 -07:00
The Android Automerger
320efc5870
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-08 06:59:05 -07:00
The Android Automerger
2f3197d8d4
JOP07D
2012-10-07 18:59:00 -07:00
The Android Automerger
543c9db0b0
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-07 18:57:48 -07:00
The Android Automerger
2841fd4c62
JOP07C
2012-10-07 16:06:32 -07:00
The Android Automerger
37cb7a82e8
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-07 16:05:02 -07:00
The Android Automerger
0dac92f803
JOP07B
2012-10-07 15:05:44 -07:00
The Android Automerger
de5ce161f7
JOP07
2012-10-07 07:00:38 -07:00
The Android Automerger
e8617dff2b
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-07 06:59:05 -07:00
The Android Automerger
9caec8e36d
JOP05E
2012-10-06 00:39:03 -07:00
The Android Automerger
4020b35379
JOP05D
2012-10-05 17:28:51 -07:00
The Android Automerger
6c8725182b
JOP05C
2012-10-05 15:09:28 -07:00
Keun young Park
f6e6bf7edf
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
2012-10-05 13:26:19 -07:00
The Android Automerger
56dc102183
JOP05B
2012-10-05 12:32:34 -07:00
The Android Automerger
8f456399e7
JOP05
2012-10-05 07:01:14 -07:00
The Android Automerger
9baa9119be
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-05 06:59:13 -07:00
The Android Automerger
4c1e35244b
JOP04C
2012-10-04 16:58:19 -07:00
The Android Automerger
533aa6f3c0
JOP04B
2012-10-04 14:22:52 -07:00
Ying Wang
af4299c56d
Merge "Store vendor module owner info on the build server." into jb-mr1-dev
2012-10-04 10:01:14 -07:00
The Android Automerger
4791318374
JOP04
2012-10-04 07:01:31 -07:00
The Android Automerger
3b95d03be4
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-04 06:59:12 -07:00
Ying Wang
fb03fb3ec0
Store vendor module owner info on the build server.
...
Bug: 7048854
Change-Id: I5f0653c71a77774978655f8b5570e170b4a9c4ec
2012-10-03 17:52:51 -07:00
Scott Main
be1df522a9
am ded6dc01
: am 86028756
: am 46c5804c
: add analytics tracking event for sdk/ndk downloads
...
* commit 'ded6dc0137fb0632f9de47870fb923567ea22b17':
add analytics tracking event for sdk/ndk downloads
2012-10-03 17:41:59 -07:00
Scott Main
ded6dc0137
am 86028756
: am 46c5804c
: add analytics tracking event for sdk/ndk downloads
...
* commit '860287560db20e6f46a282284d8a04d5e001d2ea':
add analytics tracking event for sdk/ndk downloads
2012-10-03 17:40:45 -07:00
Scott Main
860287560d
am 46c5804c
: add analytics tracking event for sdk/ndk downloads
...
* commit '46c5804c47e02206a4c97c0890991c2d3bff87bf':
add analytics tracking event for sdk/ndk downloads
2012-10-03 17:38:56 -07:00
Scott Main
46c5804c47
add analytics tracking event for sdk/ndk downloads
...
Change-Id: Icb04694ef9498ae684350ad4a971fb23d0301605
2012-10-03 16:34:52 -07:00
The Android Automerger
7283b21f42
JOP03B
2012-10-03 16:00:28 -07:00
The Android Automerger
c27010430d
JOP03
2012-10-03 07:01:14 -07:00
The Android Automerger
8f39e4524d
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-03 06:59:14 -07:00
Scott Main
8cb3263dd0
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
2012-10-02 23:32:42 -07:00
Scott Main
55b19bddcc
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
2012-10-02 23:31:34 -07:00
Scott Main
9341d398a8
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
2012-10-02 23:30:35 -07:00
Scott Main
a4888dc865
adjust position of prev/next links at bottom of page to account for russian string length
...
Change-Id: I450a11e49fb16bb9e30140d78b190d06b39e1b13
2012-10-02 23:28:08 -07:00
Scott Main
e41404f496
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
2012-10-02 21:07:42 -07:00
Scott Main
a168a83a89
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
2012-10-02 21:07:40 -07:00
Scott Main
83fca03d08
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
2012-10-02 21:05:26 -07:00
Scott Main
c914b5bf52
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
2012-10-02 21:05:25 -07:00
Scott Main
5150b1f770
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
2012-10-02 21:04:28 -07:00
Scott Main
868346827c
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
2012-10-02 21:04:11 -07:00
Scott Main
142158bd21
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
2012-10-02 21:03:18 -07:00
Scott Main
4f5f71a17d
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
2012-10-02 21:03:01 -07:00
Scott Main
3ef7592761
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
2012-10-02 21:02:46 -07:00
Scott Main
f3d0104a80
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
2012-10-02 21:02:22 -07:00
Scott Main
f5878b3ea3
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
2012-10-02 21:01:07 -07:00
Scott Main
6eb95f1ac8
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
2012-10-02 21:00:53 -07:00