OSDN Git Service
Andrew Boie [Wed, 11 Dec 2013 20:42:03 +0000 (12:42 -0800)]
sign_target_files_apks: rewrite build.prop correctly in eng builds
In eng builds, ro.display.id has many space separated items and was
resulting in an error when trying to rewrite it as 'value' gets
turned into a list and never converted back to a string.
Change-Id: I6c8633ed2eb52c56a4097992a32d53d80df4f844
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
Ying Wang [Wed, 11 Dec 2013 17:52:26 +0000 (17:52 +0000)]
Merge "Added TARGET_IS_64_BIT flag for x86_64 and aarch64"
Alexey Volkov [Wed, 11 Dec 2013 13:18:56 +0000 (17:18 +0400)]
Added TARGET_IS_64_BIT flag for x86_64 and aarch64
Change-Id: Ibdf9dafa3aeaf4b58b4a559ed05e36e2793bf6ed
Signed-off-by: Alexey Volkov <alexey.v.volkov@intel.com>
Ying Wang [Tue, 10 Dec 2013 19:32:57 +0000 (19:32 +0000)]
Merge "Add "-encoding UTF-8" option to javadoc."
Ying Wang [Tue, 10 Dec 2013 19:29:25 +0000 (11:29 -0800)]
Add "-encoding UTF-8" option to javadoc.
This fixed docs build on Mac OS X 10.9 with Java 7.
Change-Id: I91e224456c9e6c43dbf13d691c3b37d21f94b0f3
Narayan Kamath [Fri, 6 Dec 2013 17:13:58 +0000 (09:13 -0800)]
am
948206c0: Merge "Fix tools path on Mac OS for java 7."
* commit '
948206c026c8751b9d53341dfe9c2c2905ebb002':
Fix tools path on Mac OS for java 7.
Narayan Kamath [Fri, 6 Dec 2013 17:13:58 +0000 (09:13 -0800)]
am
fe57f665: Merge "A few more Java7 related clean ups."
* commit '
fe57f665074665edf469ad1e1d0fcef749f9a5bb':
A few more Java7 related clean ups.
Narayan Kamath [Fri, 6 Dec 2013 17:11:08 +0000 (17:11 +0000)]
Merge "Fix tools path on Mac OS for java 7."
Narayan Kamath [Fri, 6 Dec 2013 17:10:52 +0000 (17:10 +0000)]
Merge "A few more Java7 related clean ups."
The Android Open Source Project [Thu, 5 Dec 2013 20:59:39 +0000 (12:59 -0800)]
Merge commit '
d54f8c2d1b4d88db84465fee93aa29103ca32078' into HEAD
Change-Id: I3cf53f083dee277a450dac36b011bc83180f6294
Ying Wang [Thu, 5 Dec 2013 19:14:20 +0000 (19:14 +0000)]
Merge "Push wpa_supplicant modules down to the leaf product config."
Ying Wang [Thu, 5 Dec 2013 19:14:11 +0000 (19:14 +0000)]
Merge "Delete board config for the unused "emulator" device."
Ying Wang [Thu, 5 Dec 2013 19:14:01 +0000 (19:14 +0000)]
Merge "Explictly set WPA_SUPPLICANT_VERSION := VER_0_8_X for the generic devices"
Ying Wang [Mon, 25 Nov 2013 20:56:25 +0000 (12:56 -0800)]
Push wpa_supplicant modules down to the leaf product config.
Since
558477c0b2a5a7db679c1ad7551d43e6364d1df2 in
external/wpa_supplicant_8 we don't need those modules if
WPA_SUPPLICANT_VERSION is not set by the BoardConfig.mk.
Actually the generic devices don't need them.
Change-Id: Iff7c1fbf483bd16d5f898836c4e7401d56def80f
Conflicts:
target/product/core_tiny.mk
Ying Wang [Mon, 25 Nov 2013 19:16:13 +0000 (11:16 -0800)]
Delete board config for the unused "emulator" device.
Change-Id: I1e1d47fece4113be9f31f04775c5b310d28017e3
Ying Wang [Mon, 25 Nov 2013 18:42:17 +0000 (10:42 -0800)]
Explictly set WPA_SUPPLICANT_VERSION := VER_0_8_X for the generic devices
Since
558477c0b2a5a7db679c1ad7551d43e6364d1df2 in
external/wpa_supplicant_8 we don't have WPA_SUPPLICANT_VERSION default
to VER_0_8_X.
This fixes the SDK build.
Change-Id: Ib7a8e10705dc6b987b60b1308405e89eaa2a47c9
Narayan Kamath [Thu, 5 Dec 2013 15:20:41 +0000 (15:20 +0000)]
Fix tools path on Mac OS for java 7.
Change-Id: Ieb72b9e10771ee372bacf20258242cb006c29fef
Narayan Kamath [Thu, 5 Dec 2013 12:26:35 +0000 (12:26 +0000)]
A few more Java7 related clean ups.
- Separate SDK checking from version checking and
make messages clearer.
- Add explicit source & target versions for javac to
make things clearer.
- Rename flag from EXPERIMENTAL_USE_JAVA7_OPENJDK to
EXPERIMENTAL_USE_JAVA7.
- Allow Oracle JDK 1.7 to be used on Mac OS, since there's
no official OpenJDK support for that platform.
Change-Id: I454d2c917ed78f03ec7559a99659fefe7e7d50f3
Ying Wang [Thu, 5 Dec 2013 02:40:31 +0000 (02:40 +0000)]
Merge "Add utility function find-files-in-subdirs"
Ying Wang [Thu, 5 Dec 2013 00:04:49 +0000 (16:04 -0800)]
Add utility function find-files-in-subdirs
find-files-in-subdirs uses utility find to find given files in the given
subdirs. This function uses $(1), instead of LOCAL_PATH as the base.
Change-Id: Ib76631c97acd257d651a580cbad767606874f5d0
Ying Wang [Mon, 2 Dec 2013 22:19:27 +0000 (22:19 +0000)]
Merge "Run ar in Deterministic mode."
Ying Wang [Mon, 2 Dec 2013 22:13:02 +0000 (14:13 -0800)]
Run ar in Deterministic mode.
Unfortunately no such flag was found for the host ar on Mac OS X.
https://code.google.com/p/android/issues/detail?id=60705
Change-Id: Ic2f75c871f0b5ae3cf20c1255458f7b921054d67
Ying Wang [Mon, 2 Dec 2013 19:16:02 +0000 (19:16 +0000)]
Merge "core: support make 4.00"
Stephen Hines [Wed, 27 Nov 2013 23:18:22 +0000 (23:18 +0000)]
Merge "Add FORCE_BUILD_RS_COMPAT option."
Stephen Hines [Mon, 30 Sep 2013 22:57:36 +0000 (15:57 -0700)]
Add FORCE_BUILD_RS_COMPAT option.
This enables the .so libraries to be built for apps using the
RenderScript support library. Traditionally, we trim these .so
files from full platform builds.
Change-Id: I6f8e9b8d2b671338d3d5a5ac0bfcc60fd448688b
Elliott Hughes [Tue, 26 Nov 2013 18:51:47 +0000 (18:51 +0000)]
Merge "Switch x86 over to uapi-only."
Narayan Kamath [Tue, 26 Nov 2013 18:01:17 +0000 (18:01 +0000)]
Merge "Add experimental flag to support OpenJDK builds."
Ying Wang [Tue, 26 Nov 2013 17:51:11 +0000 (17:51 +0000)]
Merge "Change build id to OPENMASTER"
Ying Wang [Tue, 26 Nov 2013 17:50:35 +0000 (17:50 +0000)]
Merge "Version number change for AOSP master"
Ying Wang [Sat, 21 Sep 2013 00:11:43 +0000 (17:11 -0700)]
Add experimental flag to support OpenJDK builds.
bug:
8992787
(cherry picked from commit
d1dbe7f5a23bacdff086b4992e1d31a96da706c3)
Change-Id: Ie977d4f26ae8d3eee9d7b9cf2c0c270bee5b54b3
Chirayu Desai [Mon, 25 Nov 2013 10:07:38 +0000 (15:37 +0530)]
Version number change for AOSP master
Change-Id: I49ef02f99c6428bc538ba3839a0314d977f65e07
Elliott Hughes [Tue, 26 Nov 2013 00:51:54 +0000 (00:51 +0000)]
Merge "Switch MIPS over to uapi-only."
Elliott Hughes [Tue, 26 Nov 2013 00:38:47 +0000 (16:38 -0800)]
Switch x86 over to uapi-only.
Bug:
11559337
Change-Id: I95aa40ec2094acdaef1d4b4d9f0dd6278cf558d1
Elliott Hughes [Mon, 25 Nov 2013 22:01:10 +0000 (14:01 -0800)]
Switch MIPS over to uapi-only.
Bug:
11559337
Change-Id: I04b93d0d681ddf75573cdeca2d25ffa44862a35f
Elliott Hughes [Mon, 25 Nov 2013 21:42:12 +0000 (21:42 +0000)]
Merge "Add a "reverse AUX hack" for ARM."
Dave Allison [Thu, 31 Oct 2013 18:44:47 +0000 (11:44 -0700)]
Add support for instruction set features
This adds the --instruction-set-features= arguments to the dex2oat
commands for the system images. The feature set is determined at
build time
(cherry picked from commit
4145a2a20a0f275fe4c77e39d507cd5f8eb7a73b)
(cherry picked from commit
5174bb052986e9d90b597824a7e7b9ee2dfc8668)
Change-Id: I45af3b59752a48897bff2dd468b74f3ea73000be
Elliott Hughes [Mon, 25 Nov 2013 19:46:40 +0000 (11:46 -0800)]
Add a "reverse AUX hack" for ARM.
MIPS and x86 are almost completely switched over to uapi-only. ARM is still
currently old-only. A cleanup of the uapi headers over the weekend means
that the uapi-only <linux/kexec.h> is now in the right place, which will break
the ARM build unless the ARM build also looks in the uapi headers if it can't
find an old header.
Change-Id: Ie7a53ef2122b43cdef64b71d7b36a8381992a461
Ying Wang [Mon, 25 Nov 2013 19:01:43 +0000 (19:01 +0000)]
Merge "Rework the generation of host java libraries."
Narayan Kamath [Mon, 28 Oct 2013 13:20:52 +0000 (13:20 +0000)]
Rework the generation of host java libraries.
We currently have two types of host libraries, those
meant for the host VM (Sun, OpenJDK etc.) and those meant
for a host dalvik build. The former need to be compiled
against the host standard libraries and the latter need
to be compiled against libcore. This change introduces
two new build rules to complement the existing the existing
host rules.
BUILD_HOST_DALVIK_JAVA_LIBRARY : Build a java library for
a host build of dalvik. Bootclasspath will be set to a host
build of libcore.
BUILD_HOST_DALVIK_STATIC_JAVA_LIBRARY : Build a static java
library for a host build of dalvik. Bootclasspath will be set
to a host build of libcore.
This change also removes support for the LOCAL_BUILD_HOST_DEX
flag, which is now unnecessary.
bug:
8992787
(cherry picked from commit
0dd273a3f68364045c0e8bdcc10a4ecd3c07b745)
Change-Id: I3569fff8eaa4d26d55fcc317bd98471f55d74c14
Chirayu Desai [Fri, 16 Nov 2012 11:41:17 +0000 (17:11 +0530)]
Change build id to OPENMASTER
Change-Id: I2ca9b8de815c9c9e7e9d4c5a616e4ae270992761
The Android Open Source Project [Fri, 22 Nov 2013 19:06:11 +0000 (11:06 -0800)]
Merge commit '
c73341006286c391ae4d268a77f5e008045d5308' into HEAD
Change-Id: I4bf7d32d65e19dfa1f0533fdd3b2295c50b13005
Elliott Hughes [Wed, 20 Nov 2013 21:30:29 +0000 (13:30 -0800)]
am
e296f2c3: Merge "Switch mips to the uapi kernel headers."
* commit '
e296f2c38279836e23e15fad0064a88dbfe058e7':
Switch mips to the uapi kernel headers.
Elliott Hughes [Wed, 20 Nov 2013 21:26:25 +0000 (21:26 +0000)]
Merge "Switch mips to the uapi kernel headers."
Elliott Hughes [Wed, 20 Nov 2013 20:55:09 +0000 (12:55 -0800)]
Switch mips to the uapi kernel headers.
Bug:
11559337
Change-Id: Ic37b284398c049011f98651de84cef760566ebde
Elliott Hughes [Wed, 20 Nov 2013 01:16:24 +0000 (17:16 -0800)]
am
e57c8446: Merge "Switch x86 to uapi headers."
* commit '
e57c8446f0fa8e02b27e0b77aee7a2b62784cc54':
Switch x86 to uapi headers.
Elliott Hughes [Wed, 20 Nov 2013 01:12:23 +0000 (01:12 +0000)]
Merge "Switch x86 to uapi headers."
Elliott Hughes [Wed, 20 Nov 2013 00:55:00 +0000 (16:55 -0800)]
Switch x86 to uapi headers.
We still need the 'aux' hack, but this is a good step forward.
Bug:
11559337
Change-Id: Ib3d79317293e1cd3d2620c38e6b472a5994ee554
Ying Wang [Fri, 15 Nov 2013 22:56:50 +0000 (14:56 -0800)]
am
0f78b47b: Merge "Switch AOSP X86/MIPS compiler to gcc4.8"
* commit '
0f78b47bb304bc6f9597dd0788c60eb4f83d9ea0':
Switch AOSP X86/MIPS compiler to gcc4.8
Ying Wang [Fri, 15 Nov 2013 22:51:10 +0000 (22:51 +0000)]
Merge "Switch AOSP X86/MIPS compiler to gcc4.8"
Andrew Hsieh [Fri, 15 Nov 2013 02:25:58 +0000 (10:25 +0800)]
Switch AOSP X86/MIPS compiler to gcc4.8
Change-Id: Ifeee2c7d696c8a8e96e52c6ca51434260bdae5f8
Dianne Hackborn [Thu, 14 Nov 2013 23:44:33 +0000 (15:44 -0800)]
am
1611712d: am
221fcf31: Merge "Just a little .1 makes all the difference in the world." into klp-dev
* commit '
1611712dac98d13e24ac6056405713d4994d25a5':
Just a little .1 makes all the difference in the world.
Dianne Hackborn [Thu, 14 Nov 2013 22:57:39 +0000 (14:57 -0800)]
am
221fcf31: Merge "Just a little .1 makes all the difference in the world." into klp-dev
* commit '
221fcf3183978d7ec6d482e09602312485f6652f':
Just a little .1 makes all the difference in the world.
Dianne Hackborn [Thu, 14 Nov 2013 22:53:54 +0000 (22:53 +0000)]
Merge "Just a little .1 makes all the difference in the world." into klp-dev
Ben Cheng [Thu, 14 Nov 2013 22:14:22 +0000 (14:14 -0800)]
am
2e6753a0: am
de9b1835: Merge "Switch AOSP ARM build to use GCC 4.8."
* commit '
2e6753a058a766d7c0607437224470c14574a94e':
Switch AOSP ARM build to use GCC 4.8.
Ben Cheng [Thu, 14 Nov 2013 22:09:57 +0000 (14:09 -0800)]
am
de9b1835: Merge "Switch AOSP ARM build to use GCC 4.8."
* commit '
de9b1835b3f3a025c2ab57154d0b5840469868f6':
Switch AOSP ARM build to use GCC 4.8.
Ben Cheng [Thu, 14 Nov 2013 22:06:34 +0000 (22:06 +0000)]
Merge "Switch AOSP ARM build to use GCC 4.8."
Ben Cheng [Thu, 14 Nov 2013 22:05:29 +0000 (14:05 -0800)]
Switch AOSP ARM build to use GCC 4.8.
Change-Id: I65051773153ad5bc2c093cd1313acd212eb427b1
Dianne Hackborn [Thu, 14 Nov 2013 20:06:49 +0000 (12:06 -0800)]
Just a little .1 makes all the difference in the world.
Change-Id: I4c4d8f507f9e81a632e22612043dc904694c5497
Ying Wang [Thu, 14 Nov 2013 05:02:17 +0000 (21:02 -0800)]
am
18b86b97: am
77f27f1d: Merge "Cleanup x86 and x86_64 flags"
* commit '
18b86b97b83e7d254125723363f170bc6f8d391e':
Cleanup x86 and x86_64 flags
Ying Wang [Thu, 14 Nov 2013 04:57:48 +0000 (20:57 -0800)]
am
77f27f1d: Merge "Cleanup x86 and x86_64 flags"
* commit '
77f27f1dbe485d80692102743529e6973ba4a121':
Cleanup x86 and x86_64 flags
Ying Wang [Thu, 14 Nov 2013 04:54:55 +0000 (04:54 +0000)]
Merge "Cleanup x86 and x86_64 flags"
Scott Main [Thu, 14 Nov 2013 02:12:20 +0000 (18:12 -0800)]
am
9526eefb: am
4e5b39d8: style adjustment to design/dev/video buttons
* commit '
9526eefbf30da333c003d7278d2977e70304a180':
style adjustment to design/dev/video buttons
Scott Main [Thu, 14 Nov 2013 02:08:29 +0000 (02:08 +0000)]
am
4e5b39d8: style adjustment to design/dev/video buttons
* commit '
4e5b39d843548acaac73d1d1f729324805eda0a8':
style adjustment to design/dev/video buttons
Scott Main [Thu, 14 Nov 2013 00:49:22 +0000 (16:49 -0800)]
style adjustment to design/dev/video buttons
Change-Id: I97a147336805aeb340efcd12009794b02afab681
Ed Heyl [Wed, 13 Nov 2013 23:31:00 +0000 (15:31 -0800)]
am
2c8415fb: am
eebb7301: merge in release branch changes (no-op).
* commit '
2c8415fb088dcc2adde6c666f979159552609bbc':
"KOT43B"
"KOT43"
KOT42B
"KOT42"
"KOT41B"
"KOT41"
"KOT38D"
Ed Heyl [Wed, 13 Nov 2013 23:26:51 +0000 (15:26 -0800)]
am
eebb7301: merge in release branch changes (no-op).
* commit '
eebb7301b4de7c9767ef8794af34cd728bf78e06':
"KOT43B"
"KOT43"
KOT42B
"KOT42"
"KOT41B"
"KOT41"
"KOT38D"
Ed Heyl [Wed, 13 Nov 2013 23:19:15 +0000 (15:19 -0800)]
merge in release branch changes (no-op).
The Android Automerger [Wed, 13 Nov 2013 04:00:54 +0000 (20:00 -0800)]
"KOT43B"
The Android Automerger [Wed, 13 Nov 2013 04:00:37 +0000 (20:00 -0800)]
merge in klp-mr1-release history after reset to klp-dev
The Android Automerger [Wed, 13 Nov 2013 01:25:32 +0000 (17:25 -0800)]
"KOT43"
The Android Automerger [Wed, 13 Nov 2013 01:24:10 +0000 (17:24 -0800)]
merge in klp-mr1-release history after reset to klp-dev
Baligh Uddin [Wed, 13 Nov 2013 00:46:48 +0000 (16:46 -0800)]
am
dcc645eb: am
dd00a967: Merge "Revert the revert. (its time to sign MR1)" into klp-dev
* commit '
dcc645ebb1a87982d2a067b8584ff167ae2c5287':
Revert the revert. (its time to sign MR1)
Baligh Uddin [Wed, 13 Nov 2013 00:42:25 +0000 (16:42 -0800)]
am
dd00a967: Merge "Revert the revert. (its time to sign MR1)" into klp-dev
* commit '
dd00a9677b21d2dbdef6b085570e1358f172de80':
Revert the revert. (its time to sign MR1)
Baligh Uddin [Wed, 13 Nov 2013 00:38:47 +0000 (00:38 +0000)]
Merge "Revert the revert. (its time to sign MR1)" into klp-dev
Baligh Uddin [Wed, 13 Nov 2013 00:22:34 +0000 (00:22 +0000)]
Revert the revert. (its time to sign MR1)
Revert "Waiting till post MR0 - this impacts signing tools for MR0."
This reverts commit
a7b5c4a7dc77a0896d6314828b9ce85f82d103e8.
Bug:
11334314
Change-Id: I89f8996161e4258b80bf2d0bc7817f0e8e32df13
Scott Main [Tue, 12 Nov 2013 20:22:03 +0000 (12:22 -0800)]
am
680821ed: am
13cd8f15: add style for video button in docs
* commit '
680821ed27a2a2dfce7298434307065aa5ed56aa':
add style for video button in docs
Scott Main [Tue, 12 Nov 2013 20:22:02 +0000 (12:22 -0800)]
am
faff9f52: am
641c2c2f: clarify the hidden APIs in reference with better tooltips
* commit '
faff9f52c1882d4a2eadce90bf90b0fbd7082632':
clarify the hidden APIs in reference with better tooltips
Scott Main [Tue, 12 Nov 2013 20:22:02 +0000 (12:22 -0800)]
am
6ca30dab: am
03aca9a7: script to handle new static landing pages for sample topics
* commit '
6ca30dab2ad44318541dea0da28c247c49a3f79e':
script to handle new static landing pages for sample topics
Scott Main [Tue, 12 Nov 2013 20:22:01 +0000 (12:22 -0800)]
am
4a557dc9: am
f1435b73: remove the dummy sidenav from samples before populating the real list. Also make the line numbers hidden before they get moved to avoid some jankyness during load.
* commit '
4a557dc958028c46e7fa5d6b1d4661bfda8c7f23':
remove the dummy sidenav from samples before populating the real list. Also make the line numbers hidden before they get moved to avoid some jankyness during load.
Scott Main [Tue, 12 Nov 2013 20:22:00 +0000 (12:22 -0800)]
am
e84e4c20: am
70557ee5: make expandable lists under each sample sticky so they don\'t collapse when opening other project directories.
* commit '
e84e4c20d2e34f13b4c158494caac28e22f6c18e':
make expandable lists under each sample sticky so they don't collapse when opening other project directories.
Scott Main [Tue, 12 Nov 2013 20:18:38 +0000 (20:18 +0000)]
am
13cd8f15: add style for video button in docs
* commit '
13cd8f15476ec66145b3685ca5ce181491fe28c0':
add style for video button in docs
Scott Main [Tue, 12 Nov 2013 20:18:38 +0000 (20:18 +0000)]
am
641c2c2f: clarify the hidden APIs in reference with better tooltips
* commit '
641c2c2fdaf68fa48b044177fef7c890a42c8a11':
clarify the hidden APIs in reference with better tooltips
Scott Main [Tue, 12 Nov 2013 20:18:38 +0000 (20:18 +0000)]
am
03aca9a7: script to handle new static landing pages for sample topics
* commit '
03aca9a71235d3a79bf47631103ff42862af6adc':
script to handle new static landing pages for sample topics
Scott Main [Tue, 12 Nov 2013 20:18:38 +0000 (20:18 +0000)]
am
f1435b73: remove the dummy sidenav from samples before populating the real list. Also make the line numbers hidden before they get moved to avoid some jankyness during load.
* commit '
f1435b73bd373cad0bcd06f38f458f8706e07162':
remove the dummy sidenav from samples before populating the real list. Also make the line numbers hidden before they get moved to avoid some jankyness during load.
Scott Main [Tue, 12 Nov 2013 20:18:38 +0000 (20:18 +0000)]
am
70557ee5: make expandable lists under each sample sticky so they don\'t collapse when opening other project directories.
* commit '
70557ee5fc71cc6b61c3a84ea28e97bd40573779':
make expandable lists under each sample sticky so they don't collapse when opening other project directories.
Scott Main [Tue, 12 Nov 2013 19:50:59 +0000 (11:50 -0800)]
add style for video button in docs
Change-Id: I2f2dcf80aef9c55ad6a11f13549b8dd8709cbc84
The Android Automerger [Mon, 11 Nov 2013 23:50:17 +0000 (15:50 -0800)]
KOT42B
The Android Automerger [Mon, 11 Nov 2013 18:50:43 +0000 (10:50 -0800)]
"KOT42"
The Android Automerger [Mon, 11 Nov 2013 18:50:07 +0000 (10:50 -0800)]
merge in klp-mr1-release history after reset to klp-dev
The Android Automerger [Sun, 10 Nov 2013 18:04:50 +0000 (10:04 -0800)]
"KOT41B"
The Android Automerger [Sun, 10 Nov 2013 14:01:59 +0000 (06:01 -0800)]
"KOT41"
The Android Automerger [Sun, 10 Nov 2013 14:00:23 +0000 (06:00 -0800)]
merge in klp-mr1-release history after reset to klp-dev
Elliott Hughes [Fri, 8 Nov 2013 22:54:12 +0000 (14:54 -0800)]
am
f8c5a6ae: am
bd10e2c0: Merge "Switch x86_64 over to uapi headers."
* commit '
f8c5a6ae006cfa8a6e30b850cbf930a043e5e842':
Switch x86_64 over to uapi headers.
Elliott Hughes [Fri, 8 Nov 2013 22:52:30 +0000 (14:52 -0800)]
am
bd10e2c0: Merge "Switch x86_64 over to uapi headers."
* commit '
bd10e2c019b9f6a6e13f050c0e52924f456e482f':
Switch x86_64 over to uapi headers.
Elliott Hughes [Fri, 8 Nov 2013 22:50:55 +0000 (22:50 +0000)]
Merge "Switch x86_64 over to uapi headers."
Elliott Hughes [Fri, 8 Nov 2013 22:47:10 +0000 (14:47 -0800)]
Switch x86_64 over to uapi headers.
Bug:
11559337
Change-Id: Ia0a8dff9194375172d1c89daae917d2d8952ace7
Ed Heyl [Fri, 8 Nov 2013 21:59:49 +0000 (13:59 -0800)]
am
5b684e99: merge in release branch changes (no-op).
* commit '
5b684e9972b5fc3efa1814ae9b5d68ac49a60f79':
"KOT38C"
"KOT38B"
"KOT38"
"KOT37B"
"KOT37"
"KOT36"
"KOT35B"
"KOT35"
KOT31C
"KOT31B"
"KOT32"
"KOT31"
"KOT30"
"KOT29"
"KOT28"
"KOT24"
"KOT23"
"KOT22"
"KOT21"
"KOT18"
The Android Automerger [Fri, 8 Nov 2013 21:46:12 +0000 (13:46 -0800)]
"KOT38D"
Raphael Moll [Fri, 8 Nov 2013 21:38:54 +0000 (13:38 -0800)]
am
79a9a324: am
3342bf0f: Merge "Windows SDK: define BEGIN_DECLS/END_DECLS."
* commit '
79a9a3243ae701e7bc40b85b4a085ad91821d921':
Windows SDK: define BEGIN_DECLS/END_DECLS.
Raphael Moll [Fri, 8 Nov 2013 21:36:17 +0000 (13:36 -0800)]
am
3342bf0f: Merge "Windows SDK: define BEGIN_DECLS/END_DECLS."
* commit '
3342bf0fea22efeb3df0a4e3a3c50fb78ecf96ff':
Windows SDK: define BEGIN_DECLS/END_DECLS.