OSDN Git Service
JP Abgrall [Thu, 23 Oct 2014 22:20:08 +0000 (22:20 +0000)]
am
4f072e14: am
7bd80ca6: Merge "core: Let the build specify mount options for recovery" into lmp-dev
* commit '
4f072e140bba2422eae14270f22174398a86a0ba':
core: Let the build specify mount options for recovery
Michael Runge [Thu, 23 Oct 2014 22:20:07 +0000 (22:20 +0000)]
am
10ba5654: am
7cd99bad: Allow info_dict from target_files to specify mount options
* commit '
10ba56543175590bdee9e6ab13c63c3ca8beb26b':
Allow info_dict from target_files to specify mount options
JP Abgrall [Thu, 23 Oct 2014 21:57:11 +0000 (21:57 +0000)]
am
7bd80ca6: Merge "core: Let the build specify mount options for recovery" into lmp-dev
* commit '
7bd80ca6ea2b0c5c39bdb05013fb3d0188fbcfa8':
core: Let the build specify mount options for recovery
Michael Runge [Thu, 23 Oct 2014 21:57:10 +0000 (21:57 +0000)]
am
7cd99bad: Allow info_dict from target_files to specify mount options
* commit '
7cd99bad210455dc57702b7cbf674a588a5eb028':
Allow info_dict from target_files to specify mount options
Jeff Hamilton [Thu, 23 Oct 2014 20:28:21 +0000 (20:28 +0000)]
am
5069bd6b: Add a density axis to tapas.
* commit '
5069bd6bfa49c0f978ed47d44e0439b15b74cef5':
Add a density axis to tapas.
smain@google.com [Thu, 23 Oct 2014 20:28:20 +0000 (20:28 +0000)]
am
60e80ef6: am
f84e045e: Merge "add helpouts script to <head>, behind a condition that can be enabled per page" into lmp-dev
* commit '
60e80ef6e7f6a05a654154d0f43bf31ebe8fdae3':
add helpouts script to <head>, behind a condition that can be enabled per page
Ying Wang [Thu, 23 Oct 2014 19:46:53 +0000 (19:46 +0000)]
am
9318a22f: am
b6f60d57: Use the lowest common denominator 32-bit abi for arm64 cts build.
* commit '
9318a22f96dd1d4ffcae76fb20520a303ef10fdf':
Use the lowest common denominator 32-bit abi for arm64 cts build.
Jeff Hamilton [Fri, 5 Sep 2014 04:28:00 +0000 (21:28 -0700)]
Add a density axis to tapas.
It allows overriding the density the app
is built for. Currently only used in the
GMS core APK's gradle file.
Change-Id: I3606df313a3110208cd8e6acade5f558261c921f
(cherry picked from commit
7e3d2341570681e566872216796dc4f79c8695ef)
JP Abgrall [Thu, 23 Oct 2014 18:15:56 +0000 (18:15 +0000)]
Merge "core: Let the build specify mount options for recovery" into lmp-dev
JP Abgrall [Thu, 23 Oct 2014 03:01:22 +0000 (20:01 -0700)]
core: Let the build specify mount options for recovery
Currently recovery install/patch will mount /system++ with only default
options.
The default options are not very suitable for dealing with crashes.
We now use
TARGET_RECOVERY_FSTYPE_MOUNT_OPTIONS
that can specify which mount options to use for a given fs-type.
# <fstype>=<fstype_opts>[|<fstype_opts>]...
# fstype_opts := <opt>[,<opt>]...
# opt := <name>[=<value>]
If only defaults are to be used, then the BoardConfig.mk can just have
an empty (must have ""):
TARGET_RECOVERY_FSTYPE_MOUNT_OPTIONS := ""
The default is
"ext4=match_batch_time=0,commit=1,data=journal,barrier=1,errors=panic,nodelalloc"
The release tools will pick them up with
https://googleplex-android-review.git.corp.google.com/#/c/573628
Bug:
18092222
Change-Id: Iaa59099b0edf5af8835d1862fada089cff58882c
smain@google.com [Thu, 23 Oct 2014 16:34:39 +0000 (16:34 +0000)]
am
f84e045e: Merge "add helpouts script to <head>, behind a condition that can be enabled per page" into lmp-dev
* commit '
f84e045e42f0377c415b2b6fea432ea0f3967f4f':
add helpouts script to <head>, behind a condition that can be enabled per page
Bill Yi [Thu, 23 Oct 2014 13:04:59 +0000 (13:04 +0000)]
Ying Wang [Thu, 23 Oct 2014 03:18:55 +0000 (03:18 +0000)]
am
c6a12d77: am
46ba24c4: Merge "Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it."
* commit '
c6a12d776ae548c4290d76cb157807acb1ffb9f1':
Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it.
Ying Wang [Thu, 23 Oct 2014 03:18:11 +0000 (03:18 +0000)]
am
f3e4b2c9: am
18cd0225: Merge "Add -Wno-unused-command-line-argument to clang cflags to enable ccache."
* commit '
f3e4b2c98e91c073e7612adb7adb16530ba00c7b':
Add -Wno-unused-command-line-argument to clang cflags to enable ccache.
Michael Runge [Thu, 23 Oct 2014 00:21:48 +0000 (17:21 -0700)]
Allow info_dict from target_files to specify mount options
This will allow safer mount options to be added per mount FS
type, to better ensure data is written during an OTA.
Bug:
18079773,
18092222
Change-Id: I1e3e4fd4639c6fd263e550b770cc3c858ef1e03b
Ying Wang [Thu, 23 Oct 2014 00:14:19 +0000 (00:14 +0000)]
am
b6f60d57: Use the lowest common denominator 32-bit abi for arm64 cts build.
* commit '
b6f60d57e3e5ccb89145cd2513a9a35077c025a5':
Use the lowest common denominator 32-bit abi for arm64 cts build.
smain@google.com [Wed, 22 Oct 2014 23:58:07 +0000 (23:58 +0000)]
Merge "add helpouts script to <head>, behind a condition that can be enabled per page" into lmp-dev
Ying Wang [Wed, 22 Oct 2014 21:28:02 +0000 (21:28 +0000)]
am
e3fe9cf2: am
03eceba1: Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it.
* commit '
e3fe9cf21383b0444037358eaf2f207d94a560f2':
Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it.
Ying Wang [Wed, 22 Oct 2014 20:47:46 +0000 (20:47 +0000)]
am
03eceba1: Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it.
* commit '
03eceba1ddfe6cf3ae6eb22bddc889930c097c1a':
Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it.
smain@google.com [Tue, 21 Oct 2014 20:57:01 +0000 (13:57 -0700)]
add helpouts script to <head>, behind a condition that can be enabled per page
Change-Id: Ifa2364ed77a86efd6bec69dbe4f15d7f69569504
Bill Yi [Wed, 22 Oct 2014 15:45:57 +0000 (08:45 -0700)]
Clay Murphy [Wed, 22 Oct 2014 15:34:34 +0000 (15:34 +0000)]
am
238964e1: am
f7b231b7: Docs: Making source.android.com headers match those of developer.android.com
* commit '
238964e1e22df2be4c2c193867c4c0300b5f3a38':
Docs: Making source.android.com headers match those of developer.android.com
Clay Murphy [Wed, 22 Oct 2014 14:53:29 +0000 (14:53 +0000)]
am
f7b231b7: Docs: Making source.android.com headers match those of developer.android.com
* commit '
f7b231b7a64c2ab953c9f4a2eb5390f0b3a2f296':
Docs: Making source.android.com headers match those of developer.android.com
Ying Wang [Wed, 22 Oct 2014 13:12:13 +0000 (13:12 +0000)]
am
46ba24c4: Merge "Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it."
* commit '
46ba24c4a00156d6149be78928de962bf52e9502':
Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it.
Ying Wang [Wed, 22 Oct 2014 04:20:41 +0000 (21:20 -0700)]
Use the lowest common denominator 32-bit abi for arm64 cts build.
So the 32-bit code can be run any supported 32-bit arm devices.
Bug:
18038310
Change-Id: Ie8864cfdb87a4759d1a775d43cb5316b1f022e2b
Ying Wang [Wed, 22 Oct 2014 01:37:15 +0000 (01:37 +0000)]
Merge "Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it."
Ying Wang [Wed, 22 Oct 2014 01:34:30 +0000 (18:34 -0700)]
Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it.
Change-Id: I9182ce1efe09609100d19c9fae2bc4fe7358dfc0
Ying Wang [Wed, 22 Oct 2014 01:34:30 +0000 (18:34 -0700)]
Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it.
Change-Id: I9182ce1efe09609100d19c9fae2bc4fe7358dfc0
Ying Wang [Tue, 21 Oct 2014 20:20:56 +0000 (20:20 +0000)]
am
18cd0225: Merge "Add -Wno-unused-command-line-argument to clang cflags to enable ccache."
* commit '
18cd02257d7045543ba435aa1efa497c8a780f27':
Add -Wno-unused-command-line-argument to clang cflags to enable ccache.
Ying Wang [Tue, 21 Oct 2014 19:19:15 +0000 (19:19 +0000)]
Merge "Add -Wno-unused-command-line-argument to clang cflags to enable ccache."
Clay Murphy [Fri, 3 Oct 2014 21:58:50 +0000 (14:58 -0700)]
Docs: Making source.android.com headers match those of developer.android.com
Bug:
17814801
Change-Id: I128a76b32b0d92118f621062c62d72460313f4d6
Adam Lesinski [Tue, 21 Oct 2014 16:53:47 +0000 (16:53 +0000)]
am
ea24f794: am
318217a8: Enable building of gtest for Windows
* commit '
ea24f7947969a874cd4039e66af116ae655ea140':
Enable building of gtest for Windows
Adam Lesinski [Tue, 21 Oct 2014 16:40:56 +0000 (16:40 +0000)]
am
318217a8: Enable building of gtest for Windows
* commit '
318217a84a05880f5e10ba2086f87eb0320772c7':
Enable building of gtest for Windows
Ying Wang [Tue, 21 Oct 2014 00:51:50 +0000 (17:51 -0700)]
resolved conflicts for merge of
3a2b9f0a to lmp-mr1-dev-plus-aosp
Change-Id: I2e09a3845d48bc52eca49cb7913f85960e0d9db8
Naseer Ahmed [Thu, 16 Oct 2014 17:17:12 +0000 (13:17 -0400)]
core: OSX: Support 10.9 SDK as well
Change-Id: I764102df9b84ca19d217e35a209a9c80abeed6e7
Ying Wang [Fri, 17 Oct 2014 22:07:24 +0000 (15:07 -0700)]
Add -Wno-unused-command-line-argument to clang cflags to enable ccache.
Previously ccache is disabled when it fails calling clang's preprocessor with
unused arguments (such as '-Wa,--noexecstack') in the command line.
See http://petereisentraut.blogspot.com/2011/05/ccache-and-clang.html.
(-Qunused-arguments suppresses more than
-Wno-unused-command-line-argument does.)
Change-Id: I6cde307632c8395c053eb28063d7844d93070562
Adam Lesinski [Tue, 21 Oct 2014 00:01:15 +0000 (00:01 +0000)]
am
318217a8: Enable building of gtest for Windows
* commit '
318217a84a05880f5e10ba2086f87eb0320772c7':
Enable building of gtest for Windows
Adam Lesinski [Mon, 20 Oct 2014 23:06:44 +0000 (16:06 -0700)]
Enable building of gtest for Windows
Windows does not have pthread support, and by defining the
GTEST_OS_WINDOWS flag, pthread support will not be built into
the windows version of gtest.
Change-Id: I0571fc52e77bb04175470d5750a7e2f46cdd5e86
Dan Albert [Mon, 20 Oct 2014 22:42:23 +0000 (22:42 +0000)]
am
cc0aa4da: am
28c265dd: Merge "We also need -rdynamic for host ASAN."
* commit '
cc0aa4dabd4bae2b17bc9de8f88e04e862d030b2':
We also need -rdynamic for host ASAN.
Dan Albert [Mon, 20 Oct 2014 22:42:11 +0000 (22:42 +0000)]
am
cc0aa4da: am
28c265dd: Merge "We also need -rdynamic for host ASAN."
* commit '
cc0aa4dabd4bae2b17bc9de8f88e04e862d030b2':
We also need -rdynamic for host ASAN.
Dan Albert [Mon, 20 Oct 2014 22:36:45 +0000 (22:36 +0000)]
am
28c265dd: Merge "We also need -rdynamic for host ASAN."
* commit '
28c265ddddebeabc0597e976fbc817b70c46abc2':
We also need -rdynamic for host ASAN.
Dan Albert [Mon, 20 Oct 2014 22:33:49 +0000 (22:33 +0000)]
Merge "We also need -rdynamic for host ASAN."
Dan Albert [Mon, 20 Oct 2014 20:30:00 +0000 (13:30 -0700)]
We also need -rdynamic for host ASAN.
Change-Id: Iee33ca85c25d9bf126be8318a3b837074ab10076
Dan Albert [Mon, 20 Oct 2014 20:38:43 +0000 (13:38 -0700)]
resolved conflicts for merge of
96c22133 to lmp-mr1-dev-plus-aosp
Change-Id: Ia94c5ad273c3578433d3eb226e8e8de7c1921d34
Dan Albert [Mon, 20 Oct 2014 20:37:18 +0000 (13:37 -0700)]
resolved conflicts for merge of
96c22133 to lmp-dev-plus-aosp
Change-Id: I35a2f403e9e664536b45b5ac9185adf1e1a02442
Dan Albert [Mon, 20 Oct 2014 20:28:43 +0000 (20:28 +0000)]
am
1f134dd0: Merge "Add support for ASAN in host modules."
* commit '
1f134dd06cd12f032c833b9a43b476a9557fa8da':
Add support for ASAN in host modules.
Dan Albert [Mon, 20 Oct 2014 20:24:07 +0000 (20:24 +0000)]
Merge "Add support for ASAN in host modules."
Dan Albert [Mon, 20 Oct 2014 18:37:18 +0000 (11:37 -0700)]
Add support for ASAN in host modules.
Change-Id: Id9ed83499e0eb995f06e845c3153a50677d768b8
Stephen Hines [Mon, 20 Oct 2014 18:30:27 +0000 (18:30 +0000)]
am
7d86749d: am
ed8206db: Merge "Remove unnecessary 10.8-specific build rules"
* commit '
7d86749da7033dcf230ceb67f9ae0cd676441e4d':
Remove unnecessary 10.8-specific build rules
Stephen Hines [Mon, 20 Oct 2014 18:30:08 +0000 (18:30 +0000)]
am
7d86749d: am
ed8206db: Merge "Remove unnecessary 10.8-specific build rules"
* commit '
7d86749da7033dcf230ceb67f9ae0cd676441e4d':
Remove unnecessary 10.8-specific build rules
Stephen Hines [Mon, 20 Oct 2014 18:19:25 +0000 (18:19 +0000)]
am
ed8206db: Merge "Remove unnecessary 10.8-specific build rules"
* commit '
ed8206dba48e182f786ec677d56586ffaf973250':
Remove unnecessary 10.8-specific build rules
Stephen Hines [Mon, 20 Oct 2014 18:06:34 +0000 (18:06 +0000)]
Merge "Remove unnecessary 10.8-specific build rules"
Dan Albert [Sat, 18 Oct 2014 02:42:35 +0000 (02:42 +0000)]
am
ec28a489: am
28c2d3b9: Merge "Fix breakage for x86_64 static executables."
* commit '
ec28a489e8d4fe7ddc35bee1f16e08bebd202dac':
Fix breakage for x86_64 static executables.
Dan Albert [Sat, 18 Oct 2014 02:42:07 +0000 (02:42 +0000)]
am
ec28a489: am
28c2d3b9: Merge "Fix breakage for x86_64 static executables."
* commit '
ec28a489e8d4fe7ddc35bee1f16e08bebd202dac':
Fix breakage for x86_64 static executables.
Dan Albert [Sat, 18 Oct 2014 02:25:40 +0000 (02:25 +0000)]
am
28c2d3b9: Merge "Fix breakage for x86_64 static executables."
* commit '
28c2d3b9852550bc9ae150e2725e08885f1ade73':
Fix breakage for x86_64 static executables.
Dan Albert [Sat, 18 Oct 2014 01:05:36 +0000 (01:05 +0000)]
Merge "Fix breakage for x86_64 static executables."
Stephen Hines [Sat, 18 Oct 2014 00:36:42 +0000 (17:36 -0700)]
Remove unnecessary 10.8-specific build rules
We no longer need gcc for host builds, since those all run through clang. This
header include, however, triggers errors about SSE intrinsics by replacing
the more relevant include dirs that we should be using.
Change-Id: I26a949f0109de8e6e2d1f09cb8127be927549cc4
Dan Albert [Fri, 17 Oct 2014 23:58:38 +0000 (16:58 -0700)]
Fix breakage for x86_64 static executables.
Yikes. Don't know how this slipped through code review.
I had actually mentioned a need for cleanup in this part of the build
system earlier, since the amount of duplication between
transform-o-to-* for each arch means we might fix things incorrectly
in one of them (as I've just shown). Similarly, code reviewers are
likely to skim each one after the first if they all look close enough
(which is presumably what happened here).
Change-Id: I9b85914510f0b114485021deb97f42740712aae5
Clay Murphy [Fri, 17 Oct 2014 20:29:02 +0000 (20:29 +0000)]
am
597bfe1e: am
327180f5: Merge "Docs: Fixing link, adding Android Partner logo." into lmp-dev
* commit '
597bfe1e0b154df60a8ad9322ff6f248c617a9c1':
Docs: Fixing link, adding Android Partner logo.
Clay Murphy [Fri, 17 Oct 2014 20:01:06 +0000 (20:01 +0000)]
am
327180f5: Merge "Docs: Fixing link, adding Android Partner logo." into lmp-dev
* commit '
327180f5d2009be990076f152dffb244939b1673':
Docs: Fixing link, adding Android Partner logo.
Clay Murphy [Fri, 17 Oct 2014 19:52:28 +0000 (19:52 +0000)]
am
327180f5: Merge "Docs: Fixing link, adding Android Partner logo." into lmp-dev
* commit '
327180f5d2009be990076f152dffb244939b1673':
Docs: Fixing link, adding Android Partner logo.
Clay Murphy [Fri, 17 Oct 2014 19:47:51 +0000 (19:47 +0000)]
Merge "Docs: Fixing link, adding Android Partner logo." into lmp-dev
smain@google.com [Fri, 17 Oct 2014 19:12:11 +0000 (19:12 +0000)]
am
bd78b888: am
be113f8a: fix broken download buttons, make a[name] offset apply only to reference docs
* commit '
bd78b888a5072cc784a52f1b45fce765205a33e7':
fix broken download buttons, make a[name] offset apply only to reference docs
smain@google.com [Fri, 17 Oct 2014 19:12:10 +0000 (19:12 +0000)]
am
fc3f1719: am
947f3e9e: Merge "fix z-order of hangouts to avoid clobbering the search suggest" into lmp-dev
* commit '
fc3f1719b48c80749e9b48c914acee3e3be2a618':
fix z-order of hangouts to avoid clobbering the search suggest
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/
smain@google.com [Fri, 17 Oct 2014 18:53:32 +0000 (18:53 +0000)]
am
be113f8a: fix broken download buttons, make a[name] offset apply only to reference docs
* commit '
be113f8ac0f5ae00fa997db5f4507af55c523367':
fix broken download buttons, make a[name] offset apply only to reference docs
smain@google.com [Fri, 17 Oct 2014 18:52:43 +0000 (18:52 +0000)]
am
947f3e9e: Merge "fix z-order of hangouts to avoid clobbering the search suggest" into lmp-dev
* commit '
947f3e9ecf9bc7875d210a45053826eb0e110186':
fix z-order of hangouts to avoid clobbering the search suggest
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:53:07 +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
smain@google.com [Fri, 17 Oct 2014 17:00:47 +0000 (17:00 +0000)]
am
be113f8a: fix broken download buttons, make a[name] offset apply only to reference docs
* commit '
be113f8ac0f5ae00fa997db5f4507af55c523367':
fix broken download buttons, make a[name] offset apply only to reference docs
smain@google.com [Fri, 17 Oct 2014 16:56:10 +0000 (09:56 -0700)]
fix broken download buttons, make a[name] offset apply only to reference docs
Change-Id: I44421d90c335e0fcb4b35d8f568f9775a84b41ea
smain@google.com [Fri, 17 Oct 2014 08:33:52 +0000 (08:33 +0000)]
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
smain@google.com [Fri, 17 Oct 2014 08:27:18 +0000 (08:27 +0000)]
Merge "fix z-order of hangouts to avoid clobbering the search suggest" into lmp-dev
smain@google.com [Fri, 17 Oct 2014 08:21:13 +0000 (01:21 -0700)]
fix z-order of hangouts to avoid clobbering the search suggest
Change-Id: I3993a118a1c7eb33ecc661635b1e9db2416bdf73
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:44:14 +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:50:19 +0000 (05:50 +0000)]
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.
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:34:36 +0000 (05:34 +0000)]
Merge "fix scroll offset when loading non-header pages" into lmp-dev
automerge:
19c6780
* commit '
19c6780f9fc4994c0909afa900e59b9282a0d253':
fix scroll offset when loading non-header pages
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
David Friedman [Fri, 17 Oct 2014 05:03:02 +0000 (05:03 +0000)]
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/
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."
Clay Murphy [Fri, 17 Oct 2014 01:23:58 +0000 (18:23 -0700)]
Docs: Fixing link, adding Android Partner logo.
Bug:
17998826
Change-Id: Ia6b46d8230e5c9041b732e481fd5fcb546d2099d
Ying Wang [Thu, 16 Oct 2014 21:09:06 +0000 (21:09 +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: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"
OSDN Git Service
