OSDN Git Service
The Android Automerger [Thu, 3 Apr 2014 23:07:31 +0000 (16:07 -0700)]
"AAV03C"
The Android Automerger [Thu, 3 Apr 2014 18:35:22 +0000 (11:35 -0700)]
AAV03B
The Android Automerger [Thu, 3 Apr 2014 12:52:16 +0000 (05:52 -0700)]
"AAV03"
The Android Automerger [Thu, 3 Apr 2014 12:49:28 +0000 (05:49 -0700)]
merge in master-release history after reset to master
Ying Wang [Thu, 3 Apr 2014 08:31:27 +0000 (08:31 +0000)]
am
88e1a110: am
680e0370: am
59ff6009: Merge "Unset _JAVA_OPTIONS before running "java -version"."
* commit '
88e1a1103acaf5e61fd11a7c006a0c465214ac78':
Unset _JAVA_OPTIONS before running "java -version".
Dirk Dougherty [Thu, 3 Apr 2014 02:11:16 +0000 (02:11 +0000)]
am
5fe1b387: am
812d3d47: am
08032409: Add basic support for rendering dynamic content on pages.
* commit '
5fe1b387aace96990723c16e3e23a27b166483c5':
Add basic support for rendering dynamic content on pages.
Ying Wang [Thu, 3 Apr 2014 01:57:25 +0000 (01:57 +0000)]
am
680e0370: am
59ff6009: Merge "Unset _JAVA_OPTIONS before running "java -version"."
* commit '
680e037007fd0f4207a4734b8fccce17a91ee682':
Unset _JAVA_OPTIONS before running "java -version".
Ying Wang [Thu, 3 Apr 2014 01:51:19 +0000 (01:51 +0000)]
am
59ff6009: Merge "Unset _JAVA_OPTIONS before running "java -version"."
* commit '
59ff600927033db50ab4ef131ef198c686a5a65b':
Unset _JAVA_OPTIONS before running "java -version".
Ying Wang [Thu, 3 Apr 2014 01:47:18 +0000 (01:47 +0000)]
Merge "Unset _JAVA_OPTIONS before running "java -version"."
Greg Hackmann [Thu, 3 Apr 2014 01:41:16 +0000 (01:41 +0000)]
am
0fd37501: am
f518e838: am
f1750876: Merge "Revert "HACK: disable emulator on x86_64""
* commit '
0fd37501c4610783c53a6f8d4000ba7a230f61df':
Revert "HACK: disable emulator on x86_64"
Ying Wang [Thu, 3 Apr 2014 01:15:10 +0000 (18:15 -0700)]
Unset _JAVA_OPTIONS before running "java -version".
Unfortunately the previous approach of grepping out java version before
"head -n 1" clash with the effort of running "java -version" only once.
Change-Id: Ic78719c3bf1a54a45342d74bbbfa8e83bbc1bce1
Dirk Dougherty [Wed, 2 Apr 2014 23:35:43 +0000 (23:35 +0000)]
am
812d3d47: am
08032409: Add basic support for rendering dynamic content on pages.
* commit '
812d3d478be650f5b5bb1dfe00d6131986c26886':
Add basic support for rendering dynamic content on pages.
Dirk Dougherty [Wed, 2 Apr 2014 23:32:20 +0000 (23:32 +0000)]
am
08032409: Add basic support for rendering dynamic content on pages.
* commit '
08032409b4dd29740e1c8e703eada0d1ce86e58c':
Add basic support for rendering dynamic content on pages.
Greg Hackmann [Wed, 2 Apr 2014 23:04:57 +0000 (23:04 +0000)]
am
f518e838: am
f1750876: Merge "Revert "HACK: disable emulator on x86_64""
* commit '
f518e8380cc5d4e1a25ca5fad161a7cd7e7e78dd':
Revert "HACK: disable emulator on x86_64"
Greg Hackmann [Wed, 2 Apr 2014 22:58:07 +0000 (22:58 +0000)]
am
f1750876: Merge "Revert "HACK: disable emulator on x86_64""
* commit '
f17508760898e0debeb4ae7ff6455d664577c647':
Revert "HACK: disable emulator on x86_64"
Greg Hackmann [Wed, 2 Apr 2014 22:53:45 +0000 (22:53 +0000)]
Merge "Revert "HACK: disable emulator on x86_64""
The Android Automerger [Wed, 2 Apr 2014 22:44:14 +0000 (15:44 -0700)]
AAV02B
Dirk Dougherty [Sat, 15 Feb 2014 18:14:35 +0000 (10:14 -0800)]
Add basic support for rendering dynamic content on pages.
Change-Id: If3ba4f71771a01043ec6d544e3b4a9222ba35daf
Colin Cross [Wed, 2 Apr 2014 17:44:54 +0000 (17:44 +0000)]
am
0396b102: am
578f7ec4: am
45db0e05: Merge "aosp_arm64: increase userdata image size"
* commit '
0396b10235ece43be797e48673ec05c4cf4c74d7':
aosp_arm64: increase userdata image size
Colin Cross [Wed, 2 Apr 2014 17:39:56 +0000 (17:39 +0000)]
am
578f7ec4: am
45db0e05: Merge "aosp_arm64: increase userdata image size"
* commit '
578f7ec487c2c00581cdc9807d0d24883ba4406a':
aosp_arm64: increase userdata image size
Colin Cross [Wed, 2 Apr 2014 17:34:30 +0000 (17:34 +0000)]
am
45db0e05: Merge "aosp_arm64: increase userdata image size"
* commit '
45db0e058a8b0177b442b195a6ca5590525fb701':
aosp_arm64: increase userdata image size
Torne (Richard Coles) [Wed, 2 Apr 2014 17:31:04 +0000 (17:31 +0000)]
am
e4915bbe: am
59d0c658: am
c783b9bd: Merge "Add GYP as a target type that requires 2nd arch."
* commit '
e4915bbebbaaeb337df5dec87b82c18d186a6bfb':
Add GYP as a target type that requires 2nd arch.
Colin Cross [Wed, 2 Apr 2014 17:28:21 +0000 (17:28 +0000)]
Merge "aosp_arm64: increase userdata image size"
Torne (Richard Coles) [Wed, 2 Apr 2014 17:27:53 +0000 (17:27 +0000)]
am
59d0c658: am
c783b9bd: Merge "Add GYP as a target type that requires 2nd arch."
* commit '
59d0c658847d3c8118de46d2d7fa1fa3bfc563d2':
Add GYP as a target type that requires 2nd arch.
Torne (Richard Coles) [Wed, 2 Apr 2014 17:24:42 +0000 (17:24 +0000)]
am
c783b9bd: Merge "Add GYP as a target type that requires 2nd arch."
* commit '
c783b9bda96a6fc97076bb877645255fb01596fb':
Add GYP as a target type that requires 2nd arch.
Torne (Richard Coles) [Wed, 2 Apr 2014 17:20:10 +0000 (17:20 +0000)]
Merge "Add GYP as a target type that requires 2nd arch."
Colin Cross [Wed, 2 Apr 2014 16:16:37 +0000 (09:16 -0700)]
aosp_arm64: increase userdata image size
Increase userdata image size to allow make tests to builds with
extra tests to fit.
Change-Id: I2fea99d5a39816e78595215481b60ee51eb9182f
The Android Automerger [Wed, 2 Apr 2014 12:52:03 +0000 (05:52 -0700)]
"AAV02"
The Android Automerger [Wed, 2 Apr 2014 12:49:24 +0000 (05:49 -0700)]
merge in master-release history after reset to master
Narayan Kamath [Wed, 2 Apr 2014 12:34:28 +0000 (12:34 +0000)]
am
bfc9b30d: (-s ours) am
81fc969b: am
cf352c5d: Merge "Add warning message for java6 builds."
* commit '
bfc9b30d36cfbd5c01a0ff0aa7333f81e2033003':
Add warning message for java6 builds.
Narayan Kamath [Wed, 2 Apr 2014 12:26:38 +0000 (12:26 +0000)]
am
81fc969b: am
cf352c5d: Merge "Add warning message for java6 builds."
* commit '
81fc969b65fb4cc7dc9f5698aa8c37c657f853ef':
Add warning message for java6 builds.
Narayan Kamath [Wed, 2 Apr 2014 12:23:28 +0000 (12:23 +0000)]
am
cf352c5d: Merge "Add warning message for java6 builds."
* commit '
cf352c5d7e1482cc80be4eb2bbe99041a2345f8e':
Add warning message for java6 builds.
Narayan Kamath [Wed, 2 Apr 2014 12:19:49 +0000 (12:19 +0000)]
Merge "Add warning message for java6 builds."
Narayan Kamath [Mon, 17 Feb 2014 18:09:13 +0000 (18:09 +0000)]
Add warning message for java6 builds.
The instruction URL has been amended and a few additional
details have been added.
(cherry picked from
8c06afdea3d3c422d653b40fd19d5e3d4be64af2)
Change-Id: Icaffc3b13ed881ac7e29f2021ed31eb1f877a5ab
Narayan Kamath [Wed, 2 Apr 2014 11:11:58 +0000 (11:11 +0000)]
am
839d2829: (-s ours) am
35200762: am
e28df19e: Merge "Call "java[c] -version" only once"
* commit '
839d2829bcf2ddc7aaf04f6305b4b6858962896d':
Call "java[c] -version" only once
Narayan Kamath [Wed, 2 Apr 2014 11:05:22 +0000 (11:05 +0000)]
am
823f0ba6: (-s ours) am
0239220a: am
2f5de9f5: Merge "Bring main.mk in sync with "
* commit '
823f0ba6b8b52566d453d4770ac4e09f89b90842':
Bring main.mk in sync with master.
Narayan Kamath [Wed, 2 Apr 2014 10:57:13 +0000 (10:57 +0000)]
am
35200762: am
e28df19e: Merge "Call "java[c] -version" only once"
* commit '
35200762980aa2c0f90e73e38af94fd29b50f91f':
Call "java[c] -version" only once
Narayan Kamath [Wed, 2 Apr 2014 10:57:13 +0000 (10:57 +0000)]
am
0239220a: am
2f5de9f5: Merge "Bring main.mk in sync with "
* commit '
0239220a67f168fa30703e07750d1f4907dc99bf':
Bring main.mk in sync with master.
Narayan Kamath [Wed, 2 Apr 2014 10:51:15 +0000 (10:51 +0000)]
am
e28df19e: Merge "Call "java[c] -version" only once"
* commit '
e28df19e0e553f1590e304c02b19559dbee48098':
Call "java[c] -version" only once
Narayan Kamath [Wed, 2 Apr 2014 10:51:14 +0000 (10:51 +0000)]
am
2f5de9f5: Merge "Bring main.mk in sync with "
* commit '
2f5de9f50460bbd369abd4218e746553f15f24fb':
Bring main.mk in sync with master.
Narayan Kamath [Wed, 2 Apr 2014 10:48:33 +0000 (10:48 +0000)]
Merge "Call "java[c] -version" only once"
Ying Wang [Wed, 13 Nov 2013 23:05:15 +0000 (15:05 -0800)]
Call "java[c] -version" only once
and print out the full output if error occurs.
Bug:
11672548
(cherry picked from
7b66d366bf5c469130f71d0870424fcd265e0301)
Change-Id: I8e2f2ffa2f28146405273b04667efe3c8d1c03ad
Narayan Kamath [Wed, 2 Apr 2014 10:45:06 +0000 (10:45 +0000)]
Merge "Bring main.mk in sync with master."
Torne (Richard Coles) [Wed, 2 Apr 2014 10:26:44 +0000 (11:26 +0100)]
Add GYP as a target type that requires 2nd arch.
"GYP" class targets are used by external/chromium_org for gyp's "none"
type. The processing in these targets needs a separate intermediate
directory for the primary/secondary architecture, so add it to the list
in intermediates-dir-for along with libraries/executables.
Change-Id: Id05899c83b45ed0647dfbfa6b0b2e7f61b04348b
Nicolas Geoffray [Wed, 2 Apr 2014 09:09:40 +0000 (09:09 +0000)]
am
7e28c074: am
4ca6e2e5: am
38c0ac73: Merge "Use debug versions of dex2oat explicitly."
* commit '
7e28c0742794e0866cfdd19a586f9e5c9b6cfbb4':
Use debug versions of dex2oat explicitly.
Nicolas Geoffray [Wed, 2 Apr 2014 09:02:12 +0000 (09:02 +0000)]
am
4ca6e2e5: am
38c0ac73: Merge "Use debug versions of dex2oat explicitly."
* commit '
4ca6e2e52832d894b6387120e8b1c447121b5135':
Use debug versions of dex2oat explicitly.
Nicolas Geoffray [Wed, 2 Apr 2014 08:50:03 +0000 (08:50 +0000)]
am
38c0ac73: Merge "Use debug versions of dex2oat explicitly."
* commit '
38c0ac7386f1956cf06079960886275c483e0706':
Use debug versions of dex2oat explicitly.
Nicolas Geoffray [Wed, 2 Apr 2014 08:45:55 +0000 (08:45 +0000)]
Merge "Use debug versions of dex2oat explicitly."
Dmitriy Ivanov [Wed, 2 Apr 2014 00:08:31 +0000 (00:08 +0000)]
am
7e739e54: am
83695037: am
e44e8b0f: Merge "Remove redundant my_target_global_ldflags"
* commit '
7e739e549bcf7db349d9280321149b4e6839b5ab':
Remove redundant my_target_global_ldflags
Tim Murray [Wed, 2 Apr 2014 00:03:34 +0000 (00:03 +0000)]
am
7ebce18a: am
0cad8ee2: am
572e9acc: Merge "Always use prebuilt clang, even if we\'re explicitly building clang/LLVM."
* commit '
7ebce18ac0cff11fbc0877d108463a4538a33194':
Always use prebuilt clang, even if we're explicitly building clang/LLVM.
Dmitriy Ivanov [Tue, 1 Apr 2014 23:59:48 +0000 (23:59 +0000)]
am
83695037: am
e44e8b0f: Merge "Remove redundant my_target_global_ldflags"
* commit '
836950372ba00a8e65158e84ce9f35edd25c48ec':
Remove redundant my_target_global_ldflags
Dmitriy Ivanov [Tue, 1 Apr 2014 23:55:45 +0000 (23:55 +0000)]
am
e44e8b0f: Merge "Remove redundant my_target_global_ldflags"
* commit '
e44e8b0fbeaa52a3ff2ac84d6a804a2883103d7e':
Remove redundant my_target_global_ldflags
Dmitriy Ivanov [Tue, 1 Apr 2014 23:51:11 +0000 (23:51 +0000)]
Merge "Remove redundant my_target_global_ldflags"
Dmitriy Ivanov [Tue, 1 Apr 2014 23:36:21 +0000 (16:36 -0700)]
Remove redundant my_target_global_ldflags
* Fix: my_target_global_ldflags is defined in binary.mk
so they effectivelly override previous definition
Change-Id: I9c7d9bde82c3a6d25a94ae109fa71ecaa33640b0
Tim Murray [Tue, 1 Apr 2014 23:32:25 +0000 (23:32 +0000)]
am
0cad8ee2: am
572e9acc: Merge "Always use prebuilt clang, even if we\'re explicitly building clang/LLVM."
* commit '
0cad8ee2226d3af8dab854f26da405b15b3655ce':
Always use prebuilt clang, even if we're explicitly building clang/LLVM.
Tim Murray [Tue, 1 Apr 2014 23:28:58 +0000 (23:28 +0000)]
am
572e9acc: Merge "Always use prebuilt clang, even if we\'re explicitly building clang/LLVM."
* commit '
572e9accc05c467d74d3f4fbf2dbc05b8424e302':
Always use prebuilt clang, even if we're explicitly building clang/LLVM.
Tim Murray [Tue, 1 Apr 2014 23:24:56 +0000 (23:24 +0000)]
Merge "Always use prebuilt clang, even if we're explicitly building clang/LLVM."
Tim Murray [Mon, 24 Mar 2014 21:36:42 +0000 (14:36 -0700)]
Always use prebuilt clang, even if we're explicitly building clang/LLVM.
This is needed for self-hosting Clang/LLVM.
bug
13588226
Change-Id: Ic98adc2b174b12ce046b7b65bbc28901a766a485
The Android Automerger [Tue, 1 Apr 2014 22:25:09 +0000 (15:25 -0700)]
AAV01B
Brian Carlstrom [Tue, 1 Apr 2014 19:30:43 +0000 (19:30 +0000)]
am
4888fe34: resolved conflicts for merge of
cece45d2 to klp-modular-dev-plus-aosp
* commit '
4888fe345306cd747b03757a01089683a2e6c922':
cortex-a7 supports div
Brian Carlstrom [Tue, 1 Apr 2014 18:47:16 +0000 (11:47 -0700)]
resolved conflicts for merge of
cece45d2 to klp-modular-dev-plus-aosp
Change-Id: Ibec9bab6ec9d46787f521fdaa6a033106d667e76
Brian Carlstrom [Tue, 1 Apr 2014 18:33:38 +0000 (18:33 +0000)]
am
31061ccf: am
5e5d26b1: am
47e60739: Merge "cortex-a7 supports div"
* commit '
31061ccfdaf01603dfdf20f15df8021d1c7d0b85':
cortex-a7 supports div
Narayan Kamath [Tue, 1 Apr 2014 18:33:37 +0000 (18:33 +0000)]
am
b6cc8421: am
2c9552b7: am
aafbbe7e: Merge "Add a default value for ro.zygote."
* commit '
b6cc84212875fda1b8d2ccc0a66fc6a2169933d9':
Add a default value for ro.zygote.
Brian Carlstrom [Tue, 1 Apr 2014 18:27:32 +0000 (18:27 +0000)]
am
5e5d26b1: am
47e60739: Merge "cortex-a7 supports div"
* commit '
5e5d26b1efc6cb73e80e09598ab606678524ff21':
cortex-a7 supports div
Brian Carlstrom [Tue, 1 Apr 2014 18:23:35 +0000 (18:23 +0000)]
am
47e60739: Merge "cortex-a7 supports div"
* commit '
47e6073979254ef4fbc60554079b2bf19ac32ab1':
cortex-a7 supports div
Brian Carlstrom [Tue, 1 Apr 2014 18:11:22 +0000 (18:11 +0000)]
Merge "cortex-a7 supports div"
Brian Carlstrom [Mon, 31 Mar 2014 23:58:09 +0000 (16:58 -0700)]
cortex-a7 supports div
(cherry picked from commit
cece45d22652ca0d8a57a6cb03c5ca2a915a9a07)
Change-Id: I9975171ef2c2cd3a9481fa0896473fec684095f3
Narayan Kamath [Tue, 1 Apr 2014 16:33:26 +0000 (16:33 +0000)]
am
2c9552b7: am
aafbbe7e: Merge "Add a default value for ro.zygote."
* commit '
2c9552b78486ae1592303932dc70e00ff487d76f':
Add a default value for ro.zygote.
Narayan Kamath [Tue, 1 Apr 2014 16:26:40 +0000 (16:26 +0000)]
am
aafbbe7e: Merge "Add a default value for ro.zygote."
* commit '
aafbbe7e8a3a8056c483b6b516c4900cbd3b095e':
Add a default value for ro.zygote.
Narayan Kamath [Tue, 1 Apr 2014 16:21:58 +0000 (16:21 +0000)]
Merge "Add a default value for ro.zygote."
The Android Automerger [Tue, 1 Apr 2014 12:53:08 +0000 (05:53 -0700)]
"AAV01"
The Android Automerger [Tue, 1 Apr 2014 12:49:20 +0000 (05:49 -0700)]
merge in master-release history after reset to master
Narayan Kamath [Tue, 1 Apr 2014 12:00:10 +0000 (13:00 +0100)]
Bring main.mk in sync with master.
These lines were removed in aosp in commit
e2d27887b
but a bad merge conflict resolution left them in master.
Subsequent changes on master started using these variables
so they're being brought back.
Change-Id: Ic8f3c295130c47eb0d66057880f9d4f70c89af94
Nicolas Geoffray [Tue, 25 Mar 2014 11:14:26 +0000 (11:14 +0000)]
Use debug versions of dex2oat explicitly.
Change-Id: Ie7c238908a5739af752a08fec1a04914026a8f96
Ying Wang [Tue, 1 Apr 2014 03:10:25 +0000 (03:10 +0000)]
am
ff78e652: am
9cfefe13: am
6a9f2b12: Merge "Add intel to the vendor whitelist"
* commit '
ff78e6523189dd179a95309cb9630dab2d9f098d':
Add intel to the vendor whitelist
Ying Wang [Tue, 1 Apr 2014 03:05:06 +0000 (03:05 +0000)]
am
9cfefe13: am
6a9f2b12: Merge "Add intel to the vendor whitelist"
* commit '
9cfefe13aeb3295605ea47040767261df95d2cda':
Add intel to the vendor whitelist
Ying Wang [Tue, 1 Apr 2014 02:58:51 +0000 (02:58 +0000)]
am
6a9f2b12: Merge "Add intel to the vendor whitelist"
* commit '
6a9f2b1250e276267ce146777fbe6084f8fa7a3f':
Add intel to the vendor whitelist
Ying Wang [Tue, 1 Apr 2014 02:51:49 +0000 (02:51 +0000)]
Merge "Add intel to the vendor whitelist"
Daniel Leung [Thu, 6 Mar 2014 19:14:14 +0000 (11:14 -0800)]
Add intel to the vendor whitelist
Change-Id: I91d6ff72629523050b4f26c2d731cac90ef49348
Signed-off-by: Daniel Leung <daniel.leung@intel.com>
Reviewed-by: Jovanovic, Radivoje <radivoje.jovanovic@intel.com>
Reviewed-by: Boie, Andrew P <andrew.p.boie@intel.com>
Reviewed-by: Kumar-mayernik, Nisha <nisha.kumar-mayernik@intel.com>
Reviewed-by: Gumbel, Matthew K <matthew.k.gumbel@intel.com>
Tested-by: Gumbel, Matthew K <matthew.k.gumbel@intel.com>
Ying Wang [Tue, 1 Apr 2014 01:17:22 +0000 (18:17 -0700)]
resolved conflicts for merge of
f966bda4 to master
Change-Id: Ic2a16e62c6b9683bd235673e548901381dec9322
Ying Wang [Tue, 1 Apr 2014 00:15:50 +0000 (00:15 +0000)]
am
4714d3d7: am
b34af41e: Merge "Fix java version detection when _JAVA_OPTIONS is set."
* commit '
4714d3d7a604391d174049a7a595e80ebab2da18':
Fix java version detection when _JAVA_OPTIONS is set.
Ying Wang [Tue, 1 Apr 2014 00:11:00 +0000 (00:11 +0000)]
am
b34af41e: Merge "Fix java version detection when _JAVA_OPTIONS is set."
* commit '
b34af41e578b1bbc02470d01593c45fe8b04588b':
Fix java version detection when _JAVA_OPTIONS is set.
Brian Carlstrom [Mon, 31 Mar 2014 23:58:09 +0000 (16:58 -0700)]
cortex-a7 supports div
Change-Id: Id06fe4af3a71bbb8beee4d1846f1917d87664033
Greg Hackmann [Mon, 31 Mar 2014 23:54:52 +0000 (16:54 -0700)]
Revert "HACK: disable emulator on x86_64"
This reverts commit
4562c5bcb355c87a18e811ba8e6c2b6451a3ebf7.
Ying Wang [Mon, 31 Mar 2014 23:53:52 +0000 (23:53 +0000)]
Merge "Fix java version detection when _JAVA_OPTIONS is set."
The Android Automerger [Mon, 31 Mar 2014 22:57:43 +0000 (15:57 -0700)]
"AAU90B"
Peter Ammon [Mon, 31 Mar 2014 22:36:02 +0000 (15:36 -0700)]
Fix java version detection when _JAVA_OPTIONS is set.
_JAVA_OPTIONS is an environment variable that
can be used to affect the behavior of java and javac.
It is currently required to get Android to build on
some configurations, where the default Java heap size
is too small. Unfortunately, if _JAVA_OPTIONS is set,
both java and javac will output its value to the console
as the first line on every invocation, including trivial
ones like java -version. This will confuse main.mk’s
version detection, which only looks at the first line of
output. Tweak the version detection to run grep before
head, so that the _JAVA_OPTIONS line is filtered by the grep.
Change-Id: I69aee52b56d27711b7d3087ec6b3ebab07ffc3af
Christopher Ferris [Mon, 31 Mar 2014 19:50:03 +0000 (19:50 +0000)]
am
fc1a735e: am
2d0ecc1b: am
0c4870a4: Merge "Specify -mcpu=cortex-a15 for denver CPU variants."
* commit '
fc1a735ec618791df306ad2a8f2f94a3db10284d':
Specify -mcpu=cortex-a15 for denver CPU variants.
Christopher Ferris [Mon, 31 Mar 2014 19:17:31 +0000 (19:17 +0000)]
am
2d0ecc1b: am
0c4870a4: Merge "Specify -mcpu=cortex-a15 for denver CPU variants."
* commit '
2d0ecc1b0071fbdc62f8d1f26bd510cd24ff47c2':
Specify -mcpu=cortex-a15 for denver CPU variants.
Christopher Ferris [Mon, 31 Mar 2014 19:11:30 +0000 (19:11 +0000)]
am
0c4870a4: Merge "Specify -mcpu=cortex-a15 for denver CPU variants."
* commit '
0c4870a4cdefb9a0062d2fc1dbf4cdce5bd2cd4c':
Specify -mcpu=cortex-a15 for denver CPU variants.
Christopher Ferris [Mon, 31 Mar 2014 19:06:27 +0000 (19:06 +0000)]
Merge "Specify -mcpu=cortex-a15 for denver CPU variants."
Ying Wang [Mon, 31 Mar 2014 17:43:57 +0000 (17:43 +0000)]
am
1758fe1f: am
30dbfa43: am
1c380c13: Merge "Remove the unnecessary indirection of TARGET_STRIP_COMMAND"
* commit '
1758fe1f87b58f91db569ba3c0fa406f5f37819e':
Remove the unnecessary indirection of TARGET_STRIP_COMMAND
Ying Wang [Mon, 31 Mar 2014 17:37:47 +0000 (17:37 +0000)]
am
30dbfa43: am
1c380c13: Merge "Remove the unnecessary indirection of TARGET_STRIP_COMMAND"
* commit '
30dbfa43eff071438376b5699dbe3391d08204da':
Remove the unnecessary indirection of TARGET_STRIP_COMMAND
Ying Wang [Mon, 31 Mar 2014 17:34:29 +0000 (17:34 +0000)]
am
1c380c13: Merge "Remove the unnecessary indirection of TARGET_STRIP_COMMAND"
* commit '
1c380c13d9bd60eefb515ea2c0a33f900a81f970':
Remove the unnecessary indirection of TARGET_STRIP_COMMAND
Ying Wang [Mon, 31 Mar 2014 17:30:06 +0000 (17:30 +0000)]
Merge "Remove the unnecessary indirection of TARGET_STRIP_COMMAND"
The Android Automerger [Mon, 31 Mar 2014 12:50:14 +0000 (05:50 -0700)]
"AAU90"
The Android Automerger [Mon, 31 Mar 2014 12:49:09 +0000 (05:49 -0700)]
merge in master-release history after reset to master
Narayan Kamath [Mon, 31 Mar 2014 12:35:14 +0000 (12:35 +0000)]
am
f6811abe: am
9fbd3afd: am
431b4bb3: Merge "Extend the CPU ABI specification mechanism."
* commit '
f6811abe12601c9753f329cb34da568f0072ca76':
Extend the CPU ABI specification mechanism.
Narayan Kamath [Mon, 31 Mar 2014 12:21:55 +0000 (12:21 +0000)]
am
9fbd3afd: am
431b4bb3: Merge "Extend the CPU ABI specification mechanism."
* commit '
9fbd3afdecc2fee211c11a6aedb39422fa8dd773':
Extend the CPU ABI specification mechanism.
Narayan Kamath [Mon, 31 Mar 2014 12:15:37 +0000 (12:15 +0000)]
am
431b4bb3: Merge "Extend the CPU ABI specification mechanism."
* commit '
431b4bb354699704e5e601483095efed93bd908c':
Extend the CPU ABI specification mechanism.
OSDN Git Service
