OSDN Git Service
Joe Fernandez [Fri, 17 Oct 2014 19:12:09 +0000 (19:12 +0000)]
am
d804dac5: am
e321df0c: Merge "Doc change: update query params to force refresh of local js files." into lmp-dev
* commit '
d804dac5d87a4cb5ebcbfcb650f3c7b6a821441e':
Doc change: update query params to force refresh of local js files.
smain@google.com [Fri, 17 Oct 2014 19:12:08 +0000 (19:12 +0000)]
am
7f37fba6: am
19c6780f: Merge "fix scroll offset when loading non-header pages" into lmp-dev
* commit '
7f37fba64573c6b6d755e1a3c36422555feb6ff2':
fix scroll offset when loading non-header pages
David Friedman [Fri, 17 Oct 2014 19:12:07 +0000 (19:12 +0000)]
am
a3427287: am
e0471a82: Changes to NDK download table format to reflect change in download structure Associated CL: https://googleplex-android-review.git.corp.google.com/#/c/567643/
* commit '
a342728747de31a19f30fe30b46e5452cebfb359':
Changes to NDK download table format to reflect change in download structure Associated CL: https://googleplex-android-review.git.corp.google.com/#/c/567643/
Joe Fernandez [Fri, 17 Oct 2014 18:50:48 +0000 (18:50 +0000)]
am
e321df0c: Merge "Doc change: update query params to force refresh of local js files." into lmp-dev
* commit '
e321df0ca2eaada3e126393a7976cd4cc09afdf6':
Doc change: update query params to force refresh of local js files.
smain@google.com [Fri, 17 Oct 2014 18:50:47 +0000 (18:50 +0000)]
am
19c6780f: Merge "fix scroll offset when loading non-header pages" into lmp-dev
* commit '
19c6780f9fc4994c0909afa900e59b9282a0d253':
fix scroll offset when loading non-header pages
David Friedman [Fri, 17 Oct 2014 18:50:46 +0000 (18:50 +0000)]
am
e0471a82: Changes to NDK download table format to reflect change in download structure Associated CL: https://googleplex-android-review.git.corp.google.com/#/c/567643/
* 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/
Dan Albert [Fri, 17 Oct 2014 17:53:11 +0000 (17:53 +0000)]
am
fb77fe99: am
26707ca8: Merge "Use libstc++ for the name of bionic\'s STL."
* commit '
fb77fe99b7a6ef0ce016f187d79ac5d9c75742ba':
Use libstc++ for the name of bionic's STL.
Dan Albert [Fri, 17 Oct 2014 17:48:24 +0000 (17:48 +0000)]
am
26707ca8: Merge "Use libstc++ for the name of bionic\'s STL."
* commit '
26707ca8bb29b62252dd9d3d346f731f4fad2806':
Use libstc++ for the name of bionic's STL.
Dan Albert [Fri, 17 Oct 2014 17:44:36 +0000 (17:44 +0000)]
Merge "Use libstc++ for the name of bionic's STL."
Dianne Hackborn [Fri, 17 Oct 2014 17:19:57 +0000 (17:19 +0000)]
am
374712c5: Merge "Move up to API 21, Lollipop MR1." into lmp-mr1-dev
* commit '
374712c54f5416e14523eec15456bb8b4372ffac':
Move up to API 21, Lollipop MR1.
Dianne Hackborn [Fri, 17 Oct 2014 17:12:11 +0000 (17:12 +0000)]
Merge "Move up to API 21, Lollipop MR1." into lmp-mr1-dev
Dianne Hackborn [Fri, 17 Oct 2014 17:05:33 +0000 (10:05 -0700)]
Move up to API 21, Lollipop MR1.
Change-Id: I81c3455d99673447ac0bc1b48d5ab1500b2bfd20
Ian Rogers [Fri, 17 Oct 2014 07:44:19 +0000 (07:44 +0000)]
am
0251f345: am
fc82be6e: Merge "Add LPAE to dex2oat ISA feature list."
* commit '
0251f3454e5f4716716673f2df1becd0730fbc79':
Add LPAE to dex2oat ISA feature list.
Ian Rogers [Fri, 17 Oct 2014 07:34:45 +0000 (07:34 +0000)]
am
fc82be6e: Merge "Add LPAE to dex2oat ISA feature list."
* commit '
fc82be6e776acfc3d784e61e2026d65417285495':
Add LPAE to dex2oat ISA feature list.
Joe Fernandez [Fri, 17 Oct 2014 05:41:07 +0000 (05:41 +0000)]
Merge "Doc change: update query params to force refresh of local js files." into lmp-dev
smain@google.com [Fri, 17 Oct 2014 05:18:08 +0000 (05:18 +0000)]
Merge "fix scroll offset when loading non-header pages" into lmp-dev
smain@google.com [Fri, 17 Oct 2014 05:10:00 +0000 (22:10 -0700)]
fix scroll offset when loading non-header pages
Change-Id: I7a90ccf760eb06c291e88a3ace04c8c7498f75c1
Dan Albert [Fri, 17 Oct 2014 04:18:15 +0000 (21:18 -0700)]
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
Ian Rogers [Fri, 17 Oct 2014 03:56:42 +0000 (03:56 +0000)]
Merge "Add LPAE to dex2oat ISA feature list."
Ying Wang [Thu, 16 Oct 2014 21:08:12 +0000 (21:08 +0000)]
am
b3f42ed0: am
4e3e9ffb: Merge "Fix Java detection on some Linux distributions"
* commit '
b3f42ed09a141b23c0738a828788b3d77d610b4b':
Fix Java detection on some Linux distributions
Ying Wang [Thu, 16 Oct 2014 21:03:04 +0000 (21:03 +0000)]
am
4e3e9ffb: Merge "Fix Java detection on some Linux distributions"
* commit '
4e3e9ffbf314500d303724aefbddf1b89094cfd8':
Fix Java detection on some Linux distributions
Ying Wang [Thu, 16 Oct 2014 20:58:36 +0000 (20:58 +0000)]
Merge "Fix Java detection on some Linux distributions"
Ian Rogers [Thu, 16 Oct 2014 20:13:11 +0000 (20:13 +0000)]
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.
Ian Rogers [Thu, 16 Oct 2014 20:07:27 +0000 (20:07 +0000)]
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.
Ian Rogers [Thu, 16 Oct 2014 20:06:05 +0000 (13:06 -0700)]
Add LPAE to dex2oat ISA feature list.
Bug:
17993736
Change-Id: Ibdf0df017a582d7d807dff17f0392dbf28475e02
Ian Rogers [Thu, 16 Oct 2014 20:02:25 +0000 (20:02 +0000)]
Merge "Move definition of -D__ARM_FEATURE_LPAE=1 cflag to top-level."
David Friedman [Wed, 15 Oct 2014 09:21:19 +0000 (02:21 -0700)]
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
smain@google.com [Thu, 16 Oct 2014 18:50:14 +0000 (18:50 +0000)]
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
smain@google.com [Thu, 16 Oct 2014 18:35:37 +0000 (18:35 +0000)]
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
Dan Albert [Thu, 16 Oct 2014 18:10:22 +0000 (18:10 +0000)]
am
8a47f6d3: am
f2bdac77: Merge "Never use stlport on the host."
* commit '
8a47f6d3192140646d0d057c371b17e487fc2a77':
Never use stlport on the host.
Dan Albert [Thu, 16 Oct 2014 18:05:33 +0000 (18:05 +0000)]
am
f2bdac77: Merge "Never use stlport on the host."
* commit '
f2bdac77b1d99abb190253f386cc6ffe4ffbeaca':
Never use stlport on the host.
Dan Albert [Thu, 16 Oct 2014 18:01:45 +0000 (18:01 +0000)]
Merge "Never use stlport on the host."
Dirk Dougherty [Thu, 16 Oct 2014 17:28:52 +0000 (10:28 -0700)]
Doc change: update query params to force refresh of local js files.
Change-Id: I217b5b80e39452412816907d55dee23a5176b287
Dan Albert [Thu, 16 Oct 2014 16:53:51 +0000 (09:53 -0700)]
Never use stlport on the host.
LOCAL_CXX_STL := stlport should just use the default STL on the host.
Change-Id: Iede1b2d8884e237a10e000e5835addb768c8f78d
smain@google.com [Thu, 16 Oct 2014 16:32:37 +0000 (16:32 +0000)]
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
Bernhard Rosenkraenzer [Wed, 1 Oct 2014 01:30:11 +0000 (03:30 +0200)]
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>
Doug Zongker [Thu, 16 Oct 2014 07:00:26 +0000 (07:00 +0000)]
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
Conley Owens [Thu, 16 Oct 2014 07:00:26 +0000 (07:00 +0000)]
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.
Michael Runge [Thu, 16 Oct 2014 07:00:25 +0000 (07:00 +0000)]
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
smain@google.com [Thu, 16 Oct 2014 07:00:24 +0000 (07:00 +0000)]
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
Doug Zongker [Thu, 16 Oct 2014 05:52:53 +0000 (05:52 +0000)]
am
e18eb508: add support for the \'fill\' chunk type to sparse_img
* commit '
e18eb50850201e573084a0cd8e1199d877170b64':
add support for the 'fill' chunk type to sparse_img
Conley Owens [Thu, 16 Oct 2014 05:52:17 +0000 (05:52 +0000)]
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.
Michael Runge [Thu, 16 Oct 2014 05:52:17 +0000 (05:52 +0000)]
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
smain@google.com [Thu, 16 Oct 2014 05:52:16 +0000 (05:52 +0000)]
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
smain@google.com [Wed, 15 Oct 2014 23:57:09 +0000 (23:57 +0000)]
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.
Doug Zongker [Wed, 15 Oct 2014 22:55:50 +0000 (15:55 -0700)]
add support for the 'fill' chunk type to sparse_img
Bug:
17987996
Change-Id: Ia661e87877e52274a991ceb77bbed93b7e6218f2
(cherry picked from commit
629c7cc84d4880611718ab1812b9b9d1bf7ee6a0)
smain@google.com [Wed, 15 Oct 2014 23:24:55 +0000 (23:24 +0000)]
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 '
820e226d5dc63589dec0263d3639526addb5dbaa':
add butterbar for L announcement. make the butterbar an encapsulated method for inclusion multiple places.
Ian Rogers [Wed, 15 Oct 2014 22:44:16 +0000 (15:44 -0700)]
Move definition of -D__ARM_FEATURE_LPAE=1 cflag to top-level.
LPAE indicates better instructions can be used when atomicity guarantees are
needed. However, LPAE's presence isn't advertised by clang/GCC. We fake an
ARM feature to advertise its presence on architectures where it is.
Also, add a TODO documenting that cortex-a15 is not the correct CPU variant
for krait.
Change-Id: I02a1248025c32d94eca0bc8a249dc524f1ac9c36
Conley Owens [Wed, 15 Oct 2014 21:27:13 +0000 (21:27 +0000)]
Merge "Docs: Replacing s.a.c. Android logo to match other sites." into lmp-dev
Clay Murphy [Tue, 24 Jun 2014 18:32:56 +0000 (11:32 -0700)]
Docs: Replacing s.a.c. Android logo to match other sites.
Bug:
15408415
Change-Id: I9bdb294f3ff0c5aaf766b4ead79ad9614f9dbd89
smain@google.com [Fri, 3 Oct 2014 22:37:49 +0000 (15:37 -0700)]
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
Change-Id: Ie8338a7403834d2322c5088039f2936207db734b
Michael Runge [Wed, 15 Oct 2014 19:54:21 +0000 (19:54 +0000)]
Merge "Fix public/private key options on sign_target_files_apks" into lmp-dev
smain@google.com [Wed, 15 Oct 2014 19:48:58 +0000 (12:48 -0700)]
hide the butter bar but also update the CSS for recent butterbar changes
Change-Id: I29cbdfe4ef6542a0dd04642be76856f3af2732d1
smain@google.com [Wed, 15 Oct 2014 19:11:38 +0000 (19:11 +0000)]
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 '
d1ab4cb3b4ca8de66a873abb072bd73556926d4d':
add butterbar for L announcement. make the butterbar an encapsulated method for inclusion multiple places.
Michael Runge [Wed, 15 Oct 2014 03:58:38 +0000 (20:58 -0700)]
Fix public/private key options on sign_target_files_apks
The if statements appear to check for public_signing
and then calls the private_signing function, and vice
versa.
Change-Id: I4511b9bcf0e03b9ba49b69eb80db84cf31d77020
Stuart Scott [Wed, 15 Oct 2014 02:30:59 +0000 (02:30 +0000)]
am
3c0190ff: am
f06c6eff: Add abi to generated XML
* commit '
3c0190ff5bc74ba7102691b3e2db3c867a2e2442':
Add abi to generated XML
smain@google.com [Wed, 15 Oct 2014 02:15:31 +0000 (02:15 +0000)]
am
05e55e90: Merge "add butterbar for L announcement. make the butterbar an encapsulated method for inclusion multiple places." into klp-modular-docs
* commit '
05e55e9009435072ac25d2ce487d47b6c4f8a60b':
add butterbar for L announcement. make the butterbar an encapsulated method for inclusion multiple places.
smain@google.com [Wed, 15 Oct 2014 02:08:50 +0000 (02:08 +0000)]
Merge "add butterbar for L announcement. make the butterbar an encapsulated method for inclusion multiple places." into klp-modular-docs
smain@google.com [Wed, 15 Oct 2014 01:47:36 +0000 (18:47 -0700)]
add butterbar for L announcement.
make the butterbar an encapsulated method for inclusion multiple places.
Change-Id: I7716bd293372dcf88cd0bd57fb399d01bfa897a0
Stuart Scott [Wed, 15 Oct 2014 00:22:35 +0000 (00:22 +0000)]
am
f06c6eff: Add abi to generated XML
* commit '
f06c6eff656f6bf0ac06662ef21e29e446e1a43d':
Add abi to generated XML
Dan Albert [Wed, 15 Oct 2014 00:17:22 +0000 (17:17 -0700)]
resolved conflicts for merge of
852fc3e6 to lmp-mr1-dev-plus-aosp
Change-Id: I9809c14b2f9ffb539272aba66d3a27d8107b81ea
Stuart Scott [Thu, 9 Oct 2014 02:01:37 +0000 (19:01 -0700)]
Add abi to generated XML
bug:
17881028
Change-Id: I6dd37e99c0f511d8c883cb8128ea743c2e21f6ad
Dan Albert [Wed, 15 Oct 2014 00:05:35 +0000 (00:05 +0000)]
am
c131ec09: Merge "Link compiler-rt in the correct order."
* commit '
c131ec09d9ffb92473c4162c92c0646d6e731b0c':
Link compiler-rt in the correct order.
Dan Albert [Tue, 14 Oct 2014 23:59:26 +0000 (23:59 +0000)]
Merge "Link compiler-rt in the correct order."
Dan Albert [Tue, 14 Oct 2014 17:45:33 +0000 (10:45 -0700)]
Link compiler-rt in the correct order.
The compiler run-time library should always be the _last_ thing linked
when building static executables. This was being done correctly for
libgcc, but not when using compiler-rt.
Change-Id: I0689dc35f55caad2fe74c0cbb4cbe3008ded349a
Elliott Hughes [Mon, 13 Oct 2014 22:45:43 +0000 (22:45 +0000)]
am
33f33371: am
165fdf42: Merge "Remove "-mstackrealign" option from all x86 builds."
* commit '
33f33371cdef7d8faa9f39cd4902698856c0bb64':
Remove "-mstackrealign" option from all x86 builds.
Elliott Hughes [Mon, 13 Oct 2014 22:41:47 +0000 (22:41 +0000)]
am
165fdf42: Merge "Remove "-mstackrealign" option from all x86 builds."
* commit '
165fdf42042d7c13d9f7866b3a3eff841e08dad2':
Remove "-mstackrealign" option from all x86 builds.
Elliott Hughes [Mon, 13 Oct 2014 22:35:58 +0000 (22:35 +0000)]
Merge "Remove "-mstackrealign" option from all x86 builds."
Alexander Ivchenko [Tue, 16 Sep 2014 12:30:41 +0000 (16:30 +0400)]
Remove "-mstackrealign" option from all x86 builds.
For ndk docs change, please refer to:
https://android-review.googlesource.com/#/c/110100/
Change-Id: I8428e7a979eb02441066aeeee43ce693d4d0dc8d
Signed-off-by: Alexander Ivchenko <alexander.ivchenko@intel.com>
Alan Viverette [Sat, 11 Oct 2014 04:55:33 +0000 (04:55 +0000)]
am
a6f16533: am
4543ae81: Merge "Add Cutive Mono to makefiles" into lmp-dev
* commit '
a6f16533e23aa287bbeddb025d1166d3f35f1563':
Add Cutive Mono to makefiles
Alan Viverette [Sat, 11 Oct 2014 02:49:49 +0000 (02:49 +0000)]
am
4543ae81: Merge "Add Cutive Mono to makefiles" into lmp-dev
* commit '
4543ae819da023b8d51f36497c6e5445a51b70ba':
Add Cutive Mono to makefiles
Alan Viverette [Fri, 10 Oct 2014 23:41:20 +0000 (23:41 +0000)]
Merge "Add Cutive Mono to makefiles" into lmp-dev
Alan Viverette [Fri, 10 Oct 2014 19:48:34 +0000 (12:48 -0700)]
Add Cutive Mono to makefiles
BUG:
17666124
Change-Id: I73aee6b7a211bfbd0bdba9c6c630c4c5dea905c7
smain@google.com [Fri, 10 Oct 2014 17:16:09 +0000 (17:16 +0000)]
am
a8752f9d: am
f0daf562: Merge "fix bug causing anchors to fail on preview landing page; exit the onhashchange listener if there\'s no searchbar on the page" into lmp-dev
* commit '
a8752f9defb075c079a73d21bc9e99da26c5a3c9':
fix bug causing anchors to fail on preview landing page; exit the onhashchange listener if there's no searchbar on the page
smain@google.com [Fri, 10 Oct 2014 17:16:08 +0000 (17:16 +0000)]
am
e425f9bf: am
17e2c06e: make the <a> tag offset effective for the whole site, not just reference, because turns out these are also used in the manifest docs, so what the heck.
* commit '
e425f9bfddb7a395e6659c1ca1e312583fb314a6':
make the <a> tag offset effective for the whole site, not just reference, because turns out these are also used in the manifest docs, so what the heck.
Raphael Moll [Fri, 10 Oct 2014 17:16:08 +0000 (17:16 +0000)]
am
5abf8bf2: am
a4d1f6a7: SDK Addon multi-sys-img support.
* commit '
5abf8bf25743ed95f9a3bb6bf4702d2042667c59':
SDK Addon multi-sys-img support.
Ying Wang [Fri, 10 Oct 2014 16:58:03 +0000 (16:58 +0000)]
am
36cff2a9: am
edb9df24: Merge "Check to determine if we can run dex-preopt." into lmp-dev
* commit '
36cff2a9963d593da831684b5cfbb9ce73dd9c27':
Check $(built_dex) to determine if we can run dex-preopt.
smain@google.com [Fri, 10 Oct 2014 15:17:17 +0000 (15:17 +0000)]
am
f0daf562: Merge "fix bug causing anchors to fail on preview landing page; exit the onhashchange listener if there\'s no searchbar on the page" into lmp-dev
* commit '
f0daf562f766d1cf15583e171b94107c193e5db4':
fix bug causing anchors to fail on preview landing page; exit the onhashchange listener if there's no searchbar on the page
smain@google.com [Fri, 10 Oct 2014 15:17:17 +0000 (15:17 +0000)]
am
17e2c06e: make the <a> tag offset effective for the whole site, not just reference, because turns out these are also used in the manifest docs, so what the heck.
* commit '
17e2c06e8aa92b9d99e8e3a8e6f44a630e9529ad':
make the <a> tag offset effective for the whole site, not just reference, because turns out these are also used in the manifest docs, so what the heck.
Raphael Moll [Fri, 10 Oct 2014 15:17:16 +0000 (15:17 +0000)]
am
a4d1f6a7: SDK Addon multi-sys-img support.
* commit '
a4d1f6a7f0399b5e5e38b7c6f274f5fb11be48b9':
SDK Addon multi-sys-img support.
Ying Wang [Fri, 10 Oct 2014 02:31:56 +0000 (19:31 -0700)]
resolved conflicts for merge of
3907c03e to lmp-mr1-dev-plus-aosp
Change-Id: I6900c8cdf1d161fbcede73547fad1750df9abab6
Ying Wang [Fri, 10 Oct 2014 02:19:10 +0000 (02:19 +0000)]
am
f1794738: Merge "Introduce per-product per-module dex-preopt config"
* commit '
f1794738b178c22bd7f05348f2a393cdec23ade4':
Introduce per-product per-module dex-preopt config
Ying Wang [Fri, 10 Oct 2014 02:13:10 +0000 (02:13 +0000)]
Merge "Introduce per-product per-module dex-preopt config"
smain@google.com [Fri, 10 Oct 2014 02:12:24 +0000 (02:12 +0000)]
Merge "fix bug causing anchors to fail on preview landing page; exit the onhashchange listener if there's no searchbar on the page" into lmp-dev
smain@google.com [Fri, 10 Oct 2014 02:10:32 +0000 (19:10 -0700)]
make the <a> tag offset effective for the whole site,
not just reference, because turns out these are also used in the manifest docs,
so what the heck.
Change-Id: I33d3cf842377511d0733983deffa03639eb0bdbf
smain@google.com [Fri, 10 Oct 2014 01:04:10 +0000 (18:04 -0700)]
fix bug causing anchors to fail on preview landing page;
exit the onhashchange listener if there's no searchbar on the page
Change-Id: I7bdd31d0ea997e408b997856450822d1bc56af92
Raphael Moll [Fri, 10 Oct 2014 00:48:12 +0000 (17:48 -0700)]
SDK Addon multi-sys-img support.
Fix an issue where the add-on system images have 2 extra
inner folders. The sole root folder in the zip file should
be the ABI one.
Change-Id: Ie12b913438e2b1113d34222e467ff280daa23c7f
Adam Lesinski [Thu, 9 Oct 2014 22:23:43 +0000 (22:23 +0000)]
am
f082f19a: am
811e650b: Merge "Add appops command to devices" into lmp-dev
* commit '
f082f19a90e91f74ae2e88a12250addd816ad426':
Add appops command to devices
Narayan Kamath [Thu, 9 Oct 2014 22:23:42 +0000 (22:23 +0000)]
am
aec004e6: resolved conflicts for merge of
1a856098 to lmp-mr1-dev
* commit '
aec004e66c5b6bdb11e92a4acd329653128fa216':
Export build thumbprint only if the product has specified at least one oem fingerprint property
Clay Murphy [Thu, 9 Oct 2014 17:42:57 +0000 (17:42 +0000)]
am
96a81b18: am
fb68db08: Merge "Docs: Making source.android.com headers match those of developer.android.com"
* commit '
96a81b18ac1f01760a3ef573289cefdfbc810cb7':
Docs: Making source.android.com headers match those of developer.android.com
Clay Murphy [Thu, 9 Oct 2014 17:38:40 +0000 (17:38 +0000)]
am
fb68db08: Merge "Docs: Making source.android.com headers match those of developer.android.com"
* commit '
fb68db08000e2d22461edbfa663e298c672476c0':
Docs: Making source.android.com headers match those of developer.android.com
Clay Murphy [Thu, 9 Oct 2014 17:33:27 +0000 (17:33 +0000)]
Merge "Docs: Making source.android.com headers match those of developer.android.com"
Chih-Hung Hsieh [Thu, 9 Oct 2014 17:24:33 +0000 (17:24 +0000)]
am
8913e282: am
29373be8: Merge "Add -fPIC as default Clang mips ASFLAGS."
* commit '
8913e28295a9f93121fa60f74a6ff39eadd2e86d':
Add -fPIC as default Clang mips ASFLAGS.
Chih-Hung Hsieh [Thu, 9 Oct 2014 17:20:01 +0000 (17:20 +0000)]
am
29373be8: Merge "Add -fPIC as default Clang mips ASFLAGS."
* commit '
29373be81de4d6e8817434b146c395b2a28e4628':
Add -fPIC as default Clang mips ASFLAGS.
Chih-Hung Hsieh [Thu, 9 Oct 2014 17:17:07 +0000 (17:17 +0000)]
Merge "Add -fPIC as default Clang mips ASFLAGS."
Ying Wang [Thu, 9 Oct 2014 16:57:16 +0000 (16:57 +0000)]
am
edb9df24: Merge "Check to determine if we can run dex-preopt." into lmp-dev
* commit '
edb9df24d00091a5206ba36d7f32ed75d6c462b9':
Check $(built_dex) to determine if we can run dex-preopt.
Adam Lesinski [Thu, 9 Oct 2014 13:02:13 +0000 (13:02 +0000)]
am
811e650b: Merge "Add appops command to devices" into lmp-dev
* commit '
811e650b820ffa4f291d18d6f49673314848c810':
Add appops command to devices
Narayan Kamath [Thu, 9 Oct 2014 12:58:05 +0000 (13:58 +0100)]
resolved conflicts for merge of
1a856098 to lmp-mr1-dev
Change-Id: Id2ef023078a251cc58450d457f5b20261e2851a3
Dan Albert [Thu, 9 Oct 2014 01:28:25 +0000 (01:28 +0000)]
am
24c1d149: am
a01fa4f8: Merge "LOCAL_NATIVE_COVERAGE should imply -O0."
* commit '
24c1d149678dcd03f679bfa0fc29386cee779935':
LOCAL_NATIVE_COVERAGE should imply -O0.
Dan Albert [Thu, 9 Oct 2014 01:01:39 +0000 (01:01 +0000)]
am
a01fa4f8: Merge "LOCAL_NATIVE_COVERAGE should imply -O0."
* commit '
a01fa4f8a369580a888317d0ea7f3507f4dcc828':
LOCAL_NATIVE_COVERAGE should imply -O0.