smain@google.com
be113f8ac0
fix broken download buttons, make a[name] offset apply only to reference docs
...
Change-Id: I44421d90c335e0fcb4b35d8f568f9775a84b41ea
2014-10-17 09:56:10 -07:00
smain@google.com
e070d7820d
Merge "fix z-order of hangouts to avoid clobbering the search suggest" into lmp-dev
...
automerge: 947f3e9
* commit '947f3e9ecf9bc7875d210a45053826eb0e110186':
fix z-order of hangouts to avoid clobbering the search suggest
2014-10-17 08:33:52 +00:00
smain@google.com
947f3e9ecf
Merge "fix z-order of hangouts to avoid clobbering the search suggest" into lmp-dev
2014-10-17 08:27:18 +00:00
smain@google.com
77cf43e739
fix z-order of hangouts to avoid clobbering the search suggest
...
Change-Id: I3993a118a1c7eb33ecc661635b1e9db2416bdf73
2014-10-17 01:21:13 -07:00
Ian Rogers
7e771594ce
am 0251f345: am fc82be6e: Merge "Add LPAE to dex2oat ISA feature list."
...
* commit '0251f3454e5f4716716673f2df1becd0730fbc79':
Add LPAE to dex2oat ISA feature list.
2014-10-17 07:44:19 +00:00
Ian Rogers
ed2783b8c6
am 0251f345: am fc82be6e: Merge "Add LPAE to dex2oat ISA feature list."
...
* commit '0251f3454e5f4716716673f2df1becd0730fbc79':
Add LPAE to dex2oat ISA feature list.
2014-10-17 07:44:14 +00:00
Ian Rogers
0251f3454e
am fc82be6e: Merge "Add LPAE to dex2oat ISA feature list."
...
* commit 'fc82be6e776acfc3d784e61e2026d65417285495':
Add LPAE to dex2oat ISA feature list.
2014-10-17 07:34:45 +00:00
Joe Fernandez
6b607ce33d
Merge "Doc change: update query params to force refresh of local js files." into lmp-dev
...
automerge: e321df0
* commit 'e321df0ca2eaada3e126393a7976cd4cc09afdf6':
Doc change: update query params to force refresh of local js files.
2014-10-17 05:50:19 +00:00
Joe Fernandez
e321df0ca2
Merge "Doc change: update query params to force refresh of local js files." into lmp-dev
2014-10-17 05:41:07 +00:00
smain@google.com
c5b105a3a8
Merge "fix scroll offset when loading non-header pages" into lmp-dev
...
automerge: 19c6780
* commit '19c6780f9fc4994c0909afa900e59b9282a0d253':
fix scroll offset when loading non-header pages
2014-10-17 05:34:36 +00:00
smain@google.com
19c6780f9f
Merge "fix scroll offset when loading non-header pages" into lmp-dev
2014-10-17 05:18:08 +00:00
smain@google.com
11fc009469
fix scroll offset when loading non-header pages
...
Change-Id: I7a90ccf760eb06c291e88a3ace04c8c7498f75c1
2014-10-16 22:10:00 -07:00
David Friedman
79df76b1d5
Changes to NDK download table format to reflect change in download structure Associated CL: https://googleplex-android-review.git.corp.google.com/#/c/567643/
...
automerge: e0471a8
* commit 'e0471a82276d86c671a9e2a21f58eb140cb94dc0':
Changes to NDK download table format to reflect change in download structure Associated CL: https://googleplex-android-review.git.corp.google.com/#/c/567643/
2014-10-17 05:03:02 +00:00
Dan Albert
93e8cf71fc
Use libstc++ for the name of bionic's STL.
...
It is libstdc++.so, after all, and the naming makes sense for the host
this way (since it also uses libstdc++).
Change-Id: If37ffa015f7967a928ea47a290363d7696c4ce35
2014-10-16 21:18:15 -07:00
Ian Rogers
fc82be6e77
Merge "Add LPAE to dex2oat ISA feature list."
2014-10-17 03:56:42 +00:00
Clay Murphy
06dbd2655c
Docs: Fixing link, adding Android Partner logo.
...
Bug: 17998826
Change-Id: Ia6b46d8230e5c9041b732e481fd5fcb546d2099d
2014-10-16 18:23:58 -07:00
Ying Wang
19f43c18f6
am b3f42ed0: am 4e3e9ffb: Merge "Fix Java detection on some Linux distributions"
...
* commit 'b3f42ed09a141b23c0738a828788b3d77d610b4b':
Fix Java detection on some Linux distributions
2014-10-16 21:09:06 +00:00
Ying Wang
e453f5fae3
am b3f42ed0: am 4e3e9ffb: Merge "Fix Java detection on some Linux distributions"
...
* commit 'b3f42ed09a141b23c0738a828788b3d77d610b4b':
Fix Java detection on some Linux distributions
2014-10-16 21:08:12 +00:00
Ying Wang
b3f42ed09a
am 4e3e9ffb: Merge "Fix Java detection on some Linux distributions"
...
* commit '4e3e9ffbf314500d303724aefbddf1b89094cfd8':
Fix Java detection on some Linux distributions
2014-10-16 21:03:04 +00:00
Ying Wang
4e3e9ffbf3
Merge "Fix Java detection on some Linux distributions"
2014-10-16 20:58:37 +00:00
Ian Rogers
7cbe40efbb
am defe864a: am 07b212ac: Merge "Move definition of -D__ARM_FEATURE_LPAE=1 cflag to top-level."
...
* commit 'defe864ab6f971efc00328cee5ea3cb1d69d377d':
Move definition of -D__ARM_FEATURE_LPAE=1 cflag to top-level.
2014-10-16 20:13:11 +00:00
Ian Rogers
1bd593ca0b
am defe864a: am 07b212ac: Merge "Move definition of -D__ARM_FEATURE_LPAE=1 cflag to top-level."
...
* commit 'defe864ab6f971efc00328cee5ea3cb1d69d377d':
Move definition of -D__ARM_FEATURE_LPAE=1 cflag to top-level.
2014-10-16 20:13:05 +00:00
Ian Rogers
defe864ab6
am 07b212ac: Merge "Move definition of -D__ARM_FEATURE_LPAE=1 cflag to top-level."
...
* commit '07b212ac59f0018a01ad3262caa0b96b9aff30a1':
Move definition of -D__ARM_FEATURE_LPAE=1 cflag to top-level.
2014-10-16 20:07:27 +00:00
Ian Rogers
6825e3c9db
Add LPAE to dex2oat ISA feature list.
...
Bug: 17993736
Change-Id: Ibdf0df017a582d7d807dff17f0392dbf28475e02
2014-10-16 13:07:05 -07:00
Ian Rogers
07b212ac59
Merge "Move definition of -D__ARM_FEATURE_LPAE=1 cflag to top-level."
2014-10-16 20:02:26 +00:00
David Friedman
e0471a8227
Changes to NDK download table format to reflect change in download structure
...
Associated CL: https://googleplex-android-review.git.corp.google.com/#/c/567643/
Change-Id: Id19f095c506bab62a3be23a1cb0d1bf30369c54d
2014-10-16 12:14:04 -07:00
smain@google.com
624a948b85
am 8e8b871c: am f0d8234b: Merge "add helpouts banner thing to recruit providers includes script to randomly change the URL and text of link as an A/B test it\'s a bad A/B test because it does not save the A/B per session" into lmp-dev
...
* commit '8e8b871cd6e0fae18e50c11329cb58360c2e165e':
add helpouts banner thing to recruit providers includes script to randomly change the URL and text of link as an A/B test it's a bad A/B test because it does not save the A/B per session
2014-10-16 18:50:14 +00:00
smain@google.com
8e8b871cd6
am f0d8234b: Merge "add helpouts banner thing to recruit providers includes script to randomly change the URL and text of link as an A/B test it\'s a bad A/B test because it does not save the A/B per session" into lmp-dev
...
* commit 'f0d8234ba94bac48d0f5848ff9a15d2cd9bcef6b':
add helpouts banner thing to recruit providers includes script to randomly change the URL and text of link as an A/B test it's a bad A/B test because it does not save the A/B per session
2014-10-16 18:35:37 +00:00
Dan Albert
82f3ae778e
am 8a47f6d3: am f2bdac77: Merge "Never use stlport on the host."
...
* commit '8a47f6d3192140646d0d057c371b17e487fc2a77':
Never use stlport on the host.
2014-10-16 18:10:22 +00:00
Dan Albert
ad1891d1e9
am 8a47f6d3: am f2bdac77: Merge "Never use stlport on the host."
...
* commit '8a47f6d3192140646d0d057c371b17e487fc2a77':
Never use stlport on the host.
2014-10-16 18:10:15 +00:00
Dan Albert
8a47f6d319
am f2bdac77: Merge "Never use stlport on the host."
...
* commit 'f2bdac77b1d99abb190253f386cc6ffe4ffbeaca':
Never use stlport on the host.
2014-10-16 18:05:33 +00:00
Dan Albert
f2bdac77b1
Merge "Never use stlport on the host."
2014-10-16 18:01:45 +00:00
Dirk Dougherty
88c15600b8
Doc change: update query params to force refresh of local js files.
...
Change-Id: I217b5b80e39452412816907d55dee23a5176b287
2014-10-16 10:28:52 -07:00
Dan Albert
b49987e2f8
Never use stlport on the host.
...
LOCAL_CXX_STL := stlport should just use the default STL on the host.
Change-Id: Iede1b2d8884e237a10e000e5835addb768c8f78d
2014-10-16 09:53:51 -07:00
smain@google.com
07aade6f47
am f0d8234b: Merge "add helpouts banner thing to recruit providers includes script to randomly change the URL and text of link as an A/B test it\'s a bad A/B test because it does not save the A/B per session" into lmp-dev
...
* commit 'f0d8234ba94bac48d0f5848ff9a15d2cd9bcef6b':
add helpouts banner thing to recruit providers includes script to randomly change the URL and text of link as an A/B test it's a bad A/B test because it does not save the A/B per session
2014-10-16 16:36:40 +00:00
smain@google.com
f0d8234ba9
Merge "add helpouts banner thing to recruit providers includes script to randomly change the URL and text of link as an A/B test it's a bad A/B test because it does not save the A/B per session" into lmp-dev
2014-10-16 16:32:38 +00:00
Bernhard Rosenkraenzer
311384fec3
Fix Java detection on some Linux distributions
...
On some Linux distributions (spotted here on OpenMandriva Lx, but I'm
pretty sure some others do the same thing), "which javac" returns
/usr/bin/javac, which is a symlink to "../../etc/alternatives/javac",
which in turn points at whatever the JDK the user picked as his default.
Given "../../etc/alternatives/javac" is a relative symlink, the next
iteration of LSLINE=$(ls -l "$JAVAC") fails (no ../../etc/alternatives/java
relative to the build directory), causing tools.jar not to be found.
Using realpath and readlink where possible should work in all cases.
Change-Id: Ic60ac84a5b263dc1c1f2960092a7549d1024ed2e
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
2014-10-16 14:08:32 +02:00
Doug Zongker
0a364e8973
am 641bfedd: am e18eb508: add support for the \'fill\' chunk type to sparse_img
...
* commit '641bfeddf32e902842bcbcfa76d9a9c68b822659':
add support for the 'fill' chunk type to sparse_img
2014-10-16 07:00:26 +00:00
Conley Owens
569820b40d
am 21f527be: am c70ae578: Merge "Docs: Replacing s.a.c. Android logo to match other sites." into lmp-dev
...
* commit '21f527bed81ecfe7b90098edb7076983d118099d':
Docs: Replacing s.a.c. Android logo to match other sites.
2014-10-16 07:00:26 +00:00
Michael Runge
1eb7a595ab
am 92946baa: am 9d641c41: Merge "Fix public/private key options on sign_target_files_apks" into lmp-dev
...
* commit '92946baa035ee9376478185fbd74849730d20768':
Fix public/private key options on sign_target_files_apks
2014-10-16 07:00:25 +00:00
smain@google.com
bfcef089ac
am 5bf3bb5a: am c69af6fa: hide the butter bar but also update the CSS for recent butterbar changes
...
* commit '5bf3bb5ab8be76972bce3f679631869e67185295':
hide the butter bar but also update the CSS for recent butterbar changes
2014-10-16 07:00:24 +00:00
Doug Zongker
641bfeddf3
am e18eb508: add support for the \'fill\' chunk type to sparse_img
...
* commit 'e18eb50850201e573084a0cd8e1199d877170b64':
add support for the 'fill' chunk type to sparse_img
2014-10-16 05:52:53 +00:00
Conley Owens
21f527bed8
am c70ae578: Merge "Docs: Replacing s.a.c. Android logo to match other sites." into lmp-dev
...
* commit 'c70ae578118573ec2073012ab57f0307184f74a3':
Docs: Replacing s.a.c. Android logo to match other sites.
2014-10-16 05:52:17 +00:00
Michael Runge
92946baa03
am 9d641c41: Merge "Fix public/private key options on sign_target_files_apks" into lmp-dev
...
* commit '9d641c41db732c4e9e7a5dac074197f1a9d40bcc':
Fix public/private key options on sign_target_files_apks
2014-10-16 05:52:17 +00:00
smain@google.com
5bf3bb5ab8
am c69af6fa: hide the butter bar but also update the CSS for recent butterbar changes
...
* commit 'c69af6faebbc2546aebee2c5d08eedb28f2b52ee':
hide the butter bar but also update the CSS for recent butterbar changes
2014-10-16 05:52:16 +00:00
Doug Zongker
b883acc21c
am e18eb508: add support for the \'fill\' chunk type to sparse_img
...
* commit 'e18eb50850201e573084a0cd8e1199d877170b64':
add support for the 'fill' chunk type to sparse_img
2014-10-15 23:59:03 +00:00
Conley Owens
f6b538e56c
am c70ae578: Merge "Docs: Replacing s.a.c. Android logo to match other sites." into lmp-dev
...
* commit 'c70ae578118573ec2073012ab57f0307184f74a3':
Docs: Replacing s.a.c. Android logo to match other sites.
2014-10-15 23:58:13 +00:00
Michael Runge
a64ce997e2
am 9d641c41: Merge "Fix public/private key options on sign_target_files_apks" into lmp-dev
...
* commit '9d641c41db732c4e9e7a5dac074197f1a9d40bcc':
Fix public/private key options on sign_target_files_apks
2014-10-15 23:57:24 +00:00
smain@google.com
3852f80d39
am c69af6fa: hide the butter bar but also update the CSS for recent butterbar changes
...
* commit 'c69af6faebbc2546aebee2c5d08eedb28f2b52ee':
hide the butter bar but also update the CSS for recent butterbar changes
2014-10-15 23:57:18 +00:00
smain@google.com
afb1fccfbb
am e87bd05e: am 820e226d: am d1ab4cb3: am 05e55e90: Merge "add butterbar for L announcement. make the butterbar an encapsulated method for inclusion multiple places." into klp-modular-docs
...
* commit 'e87bd05ecf8633c99f859a898f9a46a2a5c26e4b':
add butterbar for L announcement. make the butterbar an encapsulated method for inclusion multiple places.
2014-10-15 23:57:09 +00:00