OSDN Git Service
The Android Open Source Project [Fri, 17 Aug 2012 01:59:13 +0000 (18:59 -0700)]
am
36bec56c: am
dfab95a1: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge
* commit '
36bec56c303ff250ba8c571c837531f82411839e':
JRO03R
JZO47
JRO03Q
The Android Open Source Project [Fri, 17 Aug 2012 01:57:26 +0000 (18:57 -0700)]
am
dfab95a1: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge
* commit '
dfab95a150da3014794fc92006c7f44e635ce1f6':
JRO03R
JZO47
JRO03Q
The Android Open Source Project [Fri, 17 Aug 2012 01:55:59 +0000 (18:55 -0700)]
Reconcile with jb-mr0-release jb-release - do not merge
Change-Id: Ie56fbb34384a4cf7d00b2ce89fd69ec434396a05
The Android Automerger [Fri, 17 Aug 2012 01:22:16 +0000 (18:22 -0700)]
JRO03R
The Android Automerger [Fri, 17 Aug 2012 00:58:34 +0000 (17:58 -0700)]
JZO47
The Android Automerger [Fri, 17 Aug 2012 00:57:18 +0000 (17:57 -0700)]
merge in jb-mr0-release history after reset to jb-dev
Ying Wang [Thu, 16 Aug 2012 23:52:25 +0000 (16:52 -0700)]
am
732b2ba7: Merge "Don\'t include system/core/include/arch/<arch>/Android.mk for apps-only build." into jb-mr1-dev
* commit '
732b2ba79a17ed5c0e4d9d7abb6ec3dfe50d45e8':
Don't include system/core/include/arch/<arch>/Android.mk for apps-only build.
Ying Wang [Thu, 16 Aug 2012 23:51:00 +0000 (16:51 -0700)]
Merge "Don't include system/core/include/arch/<arch>/Android.mk for apps-only build." into jb-mr1-dev
Ying Wang [Thu, 16 Aug 2012 23:45:01 +0000 (16:45 -0700)]
Don't include system/core/include/arch/<arch>/Android.mk for apps-only build.
Bug:
6994483
Change-Id: I76c4d96264cf94a79d59fdeb52bb37c07a9458dd
Jean-Baptiste Queru [Thu, 16 Aug 2012 22:31:04 +0000 (15:31 -0700)]
am
2f32c04d: am
d77d8906: am
6020d698: Merge "select.mk: Tune ccache options"
* commit '
2f32c04d8c454616bab383e01a4f56a9445cb1c4':
select.mk: Tune ccache options
Jean-Baptiste Queru [Thu, 16 Aug 2012 22:28:47 +0000 (15:28 -0700)]
am
d77d8906: am
6020d698: Merge "select.mk: Tune ccache options"
* commit '
d77d8906b8fc4a6e2ecaf9bc5f5b84ddec6dbe7e':
select.mk: Tune ccache options
Jean-Baptiste Queru [Thu, 16 Aug 2012 22:27:54 +0000 (15:27 -0700)]
am
6020d698: Merge "select.mk: Tune ccache options"
* commit '
6020d698f51132cab374e6c96f7da4902f3aa84f':
select.mk: Tune ccache options
The Android Automerger [Thu, 16 Aug 2012 22:21:25 +0000 (15:21 -0700)]
JRO03Q
Jean-Baptiste Queru [Thu, 16 Aug 2012 21:55:25 +0000 (14:55 -0700)]
Merge "select.mk: Tune ccache options"
Andrew Boie [Mon, 13 Aug 2012 20:45:50 +0000 (13:45 -0700)]
select.mk: Tune ccache options
With these adjustments, cached object files can now be shared across
multiple Android trees on a single workstation:
* Compiler binary modification time no longer causes cache misses,
as a hash of the compiler binary is taken rather than looking
at the mtime and size
* Header file modification time no longer causes cache misses,
the headers are now always hashed
* Macros such as __DATE__ and __TIME__ no longer cause cache misses
* All paths in preprocessed source (due to use of -g) are now relative
These options require ccache 3.1 or later to be used; ccache 2.4 will
ignore these.
Change-Id: I7839637e9dacf7240bd9b7bfaa6406b1db423560
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
Ying Wang [Thu, 16 Aug 2012 17:12:42 +0000 (10:12 -0700)]
am
bc415dd5: Support to build emmap_mata.zip in unbundled builds.
* commit '
bc415dd5eb2a135cbc24c21760338e6294c7a0d3':
Support to build emmap_mata.zip in unbundled builds.
Ying Wang [Wed, 15 Aug 2012 19:22:44 +0000 (12:22 -0700)]
Support to build emmap_mata.zip in unbundled builds.
Bug:
6987838
Change-Id: Id6c81b08c4859442b7d52054ed5f278575719d1a
Elliott Hughes [Thu, 16 Aug 2012 03:04:43 +0000 (20:04 -0700)]
am
a8352cac: am
0fc8d635: am
f2a618e1: Merge "The zoneinfo stuff is no longer legacy."
* commit '
a8352cac8dae324b9d30751a2e05628db5147f45':
The zoneinfo stuff is no longer legacy.
Elliott Hughes [Thu, 16 Aug 2012 03:03:54 +0000 (20:03 -0700)]
am
0fc8d635: am
f2a618e1: Merge "The zoneinfo stuff is no longer legacy."
* commit '
0fc8d635a7f3712cc24f7a29d97755bc15972a0a':
The zoneinfo stuff is no longer legacy.
Elliott Hughes [Thu, 16 Aug 2012 03:02:49 +0000 (20:02 -0700)]
am
f2a618e1: Merge "The zoneinfo stuff is no longer legacy."
* commit '
f2a618e1df126c6c48622cce948825e923b52dcb':
The zoneinfo stuff is no longer legacy.
Elliott Hughes [Thu, 16 Aug 2012 02:43:40 +0000 (19:43 -0700)]
Merge "The zoneinfo stuff is no longer legacy."
Elliott Hughes [Thu, 16 Aug 2012 01:34:49 +0000 (18:34 -0700)]
The zoneinfo stuff is no longer legacy.
Change-Id: I7f76dfc15c0b2febbcdb13f12ff9390dca124585
Keun young Park [Wed, 15 Aug 2012 21:04:09 +0000 (14:04 -0700)]
Keun young Park [Wed, 15 Aug 2012 20:42:37 +0000 (13:42 -0700)]
fix MIPS build
- crtxx.o built under TARGET_OUT_INTERMEDIATE_LIBRARIES,
not under TARGET_OUT_STATIC_LIBRARIES
Change-Id: Ife05206bd66f691853100bbf17e08a13c287d073
Keun young Park [Wed, 15 Aug 2012 19:24:27 +0000 (12:24 -0700)]
am
81821821: fix PDK boot issue
* commit '
8182182182b878e25d871eb2f683f61796fdd43d':
fix PDK boot issue
Keun young Park [Wed, 15 Aug 2012 18:32:23 +0000 (11:32 -0700)]
fix PDK boot issue
- add missing packages to make it boot
Change-Id: I9a4a635e67a82c326f9eb1eceb86cffc8f59a2d3
Iliyan Malchev [Wed, 15 Aug 2012 16:19:57 +0000 (09:19 -0700)]
am
0016a9ba: Merge "build: register BOARD_HAVE_BLUETOOTH_QCOM" into jb-mr1-dev
* commit '
0016a9ba8dfcc91571820087e96cb87b9b9215c4':
build: register BOARD_HAVE_BLUETOOTH_QCOM
Iliyan Malchev [Wed, 15 Aug 2012 16:18:11 +0000 (09:18 -0700)]
Merge "build: register BOARD_HAVE_BLUETOOTH_QCOM" into jb-mr1-dev
The Android Open Source Project [Wed, 15 Aug 2012 15:26:18 +0000 (08:26 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I5103348a4d9516d799377625c905fac66c9c9837
Iliyan Malchev [Wed, 15 Aug 2012 15:12:01 +0000 (08:12 -0700)]
build: register BOARD_HAVE_BLUETOOTH_QCOM
Change-Id: I594abd6d3b152a4e5bc48b6ac447e155c85b2fe0
Signed-off-by: Iliyan Malchev <malchev@google.com>
The Android Open Source Project [Wed, 15 Aug 2012 15:06:43 +0000 (08:06 -0700)]
am
0062f811: am
1a0f6725: (-s ours) Reconcile with jb-release - do not merge
* commit '
0062f811c0727e329bf96a75876a99e661419d0f':
JRO03P
The Android Open Source Project [Wed, 15 Aug 2012 15:05:37 +0000 (08:05 -0700)]
am
1a0f6725: (-s ours) Reconcile with jb-release - do not merge
* commit '
1a0f6725392279ed6b44e97b00315b8173abf454':
JRO03P
The Android Open Source Project [Wed, 15 Aug 2012 15:04:29 +0000 (08:04 -0700)]
Reconcile with jb-release - do not merge
Change-Id: I3ea7d0a8c3865290f404bb24b464fcfb7410dd0e
The Android Automerger [Wed, 15 Aug 2012 13:36:46 +0000 (06:36 -0700)]
JOO46
The Android Automerger [Wed, 15 Aug 2012 13:33:28 +0000 (06:33 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Scott Main [Wed, 15 Aug 2012 01:13:24 +0000 (18:13 -0700)]
am
d3ee366a: am
021ff2ee: am
9edfa6db: docs: move home.css into default.css to reduce number of requests
* commit '
d3ee366af2ce12093478c35b14a1160599b27f71':
docs: move home.css into default.css to reduce number of requests
Scott Main [Wed, 15 Aug 2012 01:12:02 +0000 (18:12 -0700)]
am
021ff2ee: am
9edfa6db: docs: move home.css into default.css to reduce number of requests
* commit '
021ff2ee388bdb548ae55b349535d14e0423207c':
docs: move home.css into default.css to reduce number of requests
Scott Main [Wed, 15 Aug 2012 01:10:52 +0000 (18:10 -0700)]
am
9edfa6db: docs: move home.css into default.css to reduce number of requests
* commit '
9edfa6db8c53ef9515aaeed734bea02c5d65e1e5':
docs: move home.css into default.css to reduce number of requests
The Android Automerger [Tue, 14 Aug 2012 23:52:17 +0000 (16:52 -0700)]
JOO45C
Doug Zongker [Tue, 14 Aug 2012 23:51:40 +0000 (16:51 -0700)]
am
24cd2803: allow diff program to be selected explicitly
* commit '
24cd28032890b1ca7fbc34320a22bd575f59d641':
allow diff program to be selected explicitly
Doug Zongker [Tue, 14 Aug 2012 23:36:15 +0000 (16:36 -0700)]
allow diff program to be selected explicitly
Change-Id: I1d8df9cc3ed35cc5983bc50fc13975db32072dbe
Scott Main [Tue, 14 Aug 2012 22:04:40 +0000 (15:04 -0700)]
docs: move home.css into default.css to reduce number of requests
Change-Id: I156182c5ad1545f570808af565948cbd3c05a3ee
Jesse Hall [Tue, 14 Aug 2012 22:33:05 +0000 (15:33 -0700)]
am
8513b62f: Merge "Include FusedLocation.apk on sdk builds too" into jb-mr1-dev
* commit '
8513b62f6acda50db9afc3194165488c44819dd2':
Include FusedLocation.apk on sdk builds too
Jesse Hall [Tue, 14 Aug 2012 22:31:42 +0000 (15:31 -0700)]
Merge "Include FusedLocation.apk on sdk builds too" into jb-mr1-dev
The Android Automerger [Tue, 14 Aug 2012 21:58:43 +0000 (14:58 -0700)]
JOO45B
Jesse Hall [Tue, 14 Aug 2012 20:34:10 +0000 (13:34 -0700)]
Include FusedLocation.apk on sdk builds too
Bug:
6969889
Change-Id: Ifda8df58906b3e1d77de0f7de0b1dd07c6bf430f
Ying Wang [Tue, 14 Aug 2012 20:09:19 +0000 (13:09 -0700)]
am
27d51bf6: Force out LOCAL_NDK_VERSION.
* commit '
27d51bf6d3cd4189085238503d46a5a570173e1b':
Force out LOCAL_NDK_VERSION.
Ying Wang [Tue, 14 Aug 2012 18:08:03 +0000 (11:08 -0700)]
Force out LOCAL_NDK_VERSION.
Change-Id: I0a9f1a630ef2019bed38d420525eac9510b09798
Ying Wang [Tue, 14 Aug 2012 19:13:15 +0000 (12:13 -0700)]
am
54fdb473: Retire LOCAL_NDK_VERSION.
* commit '
54fdb473b656544c75ad06497ecf20a1e8d6b539':
Retire LOCAL_NDK_VERSION.
Ying Wang [Tue, 14 Aug 2012 18:58:53 +0000 (11:58 -0700)]
am
d4f0ffcb: Merge "Adopt the new prebuilts/ndk/<number> paths." into jb-mr1-dev
* commit '
d4f0ffcb6b30c96160667d1757edb9d3692caba8':
Adopt the new prebuilts/ndk/<number> paths.
Ying Wang [Tue, 14 Aug 2012 17:13:16 +0000 (10:13 -0700)]
Retire LOCAL_NDK_VERSION.
We are now unifying the NDK versions of unbundled native code to always
use the latest NDK.
We don't need the variable LOCAL_NDK_VERSION now.
To build native code with NDK, you need set just LOCAL_SDK_VERSION.
Bug:
6932421
Change-Id: I86f05a264249cda6bae97b4b1616f03700cd9dfa
Jean-Baptiste Queru [Tue, 14 Aug 2012 18:57:19 +0000 (11:57 -0700)]
am
1196c824: am
7159a992: am
4eddad55: Merge "Set the AOSP master to be API level 16"
* commit '
1196c82491e29eed257a44aa7384d8b836657b82':
Set the AOSP master to be API level 16
Ying Wang [Tue, 14 Aug 2012 18:57:01 +0000 (11:57 -0700)]
Merge "Adopt the new prebuilts/ndk/<number> paths." into jb-mr1-dev
Ying Wang [Fri, 10 Aug 2012 17:57:37 +0000 (10:57 -0700)]
Adopt the new prebuilts/ndk/<number> paths.
Bug:
6932421
Change-Id: Iba7200aacef2201001f92c6ffa020881f0b528ea
Jean-Baptiste Queru [Tue, 14 Aug 2012 18:55:19 +0000 (11:55 -0700)]
am
7159a992: am
4eddad55: Merge "Set the AOSP master to be API level 16"
* commit '
7159a992ddcda51c91843a29cd1aa30815bc8370':
Set the AOSP master to be API level 16
Jean-Baptiste Queru [Tue, 14 Aug 2012 18:53:40 +0000 (11:53 -0700)]
am
4eddad55: Merge "Set the AOSP master to be API level 16"
* commit '
4eddad550ee81edba01734bf378612ed18841751':
Set the AOSP master to be API level 16
Jean-Baptiste Queru [Tue, 14 Aug 2012 17:51:21 +0000 (10:51 -0700)]
Merge "Set the AOSP master to be API level 16"
Jean-Baptiste Queru [Tue, 14 Aug 2012 16:07:33 +0000 (09:07 -0700)]
Set the AOSP master to be API level 16
Change-Id: I3ba4317aa1081ae5f60ac8504cfff8f4abee5e66
The Android Automerger [Tue, 14 Aug 2012 14:08:55 +0000 (07:08 -0700)]
JOO45
The Android Automerger [Tue, 14 Aug 2012 14:06:10 +0000 (07:06 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Mon, 13 Aug 2012 23:33:55 +0000 (16:33 -0700)]
JOO44B
Ying Wang [Mon, 13 Aug 2012 23:27:07 +0000 (16:27 -0700)]
am
f59a64b7: am
d3d0beca: am
392bdc1f: Merge "Move the selinux modules to core PRODUCT_PACKAGES"
* commit '
f59a64b7cba7330701b8791698e67abff8afde65':
Move the selinux modules to core PRODUCT_PACKAGES
Ying Wang [Mon, 13 Aug 2012 23:26:06 +0000 (16:26 -0700)]
am
d3d0beca: am
392bdc1f: Merge "Move the selinux modules to core PRODUCT_PACKAGES"
* commit '
d3d0becac9a13836b7c20acba3b21b0625d92324':
Move the selinux modules to core PRODUCT_PACKAGES
Ying Wang [Mon, 13 Aug 2012 23:24:11 +0000 (16:24 -0700)]
am
392bdc1f: Merge "Move the selinux modules to core PRODUCT_PACKAGES"
* commit '
392bdc1f08eb03ad04eba24a76cc0aea7e1b46d6':
Move the selinux modules to core PRODUCT_PACKAGES
The Android Automerger [Mon, 13 Aug 2012 23:07:45 +0000 (16:07 -0700)]
JRO03P
Ying Wang [Mon, 13 Aug 2012 23:05:37 +0000 (16:05 -0700)]
am
4150db69: am
d7547163: am
679b7498: Merge "Add mac_permissions.xml dependency."
* commit '
4150db6905a1a72ed7f400556e89c39054700518':
Add mac_permissions.xml dependency.
Ying Wang [Mon, 13 Aug 2012 23:03:29 +0000 (16:03 -0700)]
am
d7547163: am
679b7498: Merge "Add mac_permissions.xml dependency."
* commit '
d7547163d5b0bf9e2cde626c0b7c6a58d48eb89e':
Add mac_permissions.xml dependency.
Ying Wang [Mon, 13 Aug 2012 22:41:12 +0000 (15:41 -0700)]
Merge "Move the selinux modules to core PRODUCT_PACKAGES"
Ying Wang [Mon, 13 Aug 2012 22:03:00 +0000 (15:03 -0700)]
Move the selinux modules to core PRODUCT_PACKAGES
The module names are phony targets and we should avoid having file targets
depend on phony targets.
Instead the build system makes sure to use the file dependency with
PRODUCT_PACKAGES.
Change-Id: I8dc59d8f9ed92c146b8827d71278e27214e60f3a
Ying Wang [Mon, 13 Aug 2012 22:17:45 +0000 (15:17 -0700)]
am
679b7498: Merge "Add mac_permissions.xml dependency."
* commit '
679b7498af86ee084791e86d06eaad87fe2f27f0':
Add mac_permissions.xml dependency.
Ying Wang [Mon, 13 Aug 2012 21:52:24 +0000 (14:52 -0700)]
Merge "Add mac_permissions.xml dependency."
The Android Automerger [Mon, 13 Aug 2012 15:11:27 +0000 (08:11 -0700)]
JOO44
The Android Automerger [Mon, 13 Aug 2012 15:09:08 +0000 (08:09 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Elliott Hughes [Sat, 11 Aug 2012 22:16:31 +0000 (15:16 -0700)]
am
880d3f39: resolved conflicts for merge of
0ac38a4e to jb-mr1-dev
* commit '
880d3f39f711f9ca6d2ba5c9cf127265fa39efad':
Remove TARGET_linux-sh.mk.
Elliott Hughes [Sat, 11 Aug 2012 19:00:51 +0000 (12:00 -0700)]
resolved conflicts for merge of
0ac38a4e to jb-mr1-dev
Change-Id: I0978f511f807797f89be4002bca654492231761c
Elliott Hughes [Sat, 11 Aug 2012 18:51:39 +0000 (11:51 -0700)]
am
20e713d1: Merge "Remove TARGET_linux-sh.mk."
* commit '
20e713d151dde66058453ec822b6bca8793008a4':
Remove TARGET_linux-sh.mk.
Elliott Hughes [Sat, 11 Aug 2012 16:34:51 +0000 (09:34 -0700)]
Merge "Remove TARGET_linux-sh.mk."
Nick Pelly [Sat, 11 Aug 2012 01:56:43 +0000 (18:56 -0700)]
am
0de821b0: Merge "Include FusedLocation.apk on all builds." into jb-mr1-dev
* commit '
0de821b0b10bbf3404827f21bfa9a2489d7358c5':
Include FusedLocation.apk on all builds.
Nick Pelly [Sat, 11 Aug 2012 01:54:22 +0000 (18:54 -0700)]
Merge "Include FusedLocation.apk on all builds." into jb-mr1-dev
Nick Pelly [Sat, 11 Aug 2012 01:50:36 +0000 (18:50 -0700)]
Include FusedLocation.apk on all builds.
Change-Id: Ifc98195b51971ff65e1661f89e08965daefc3506
Guang Zhu [Sat, 11 Aug 2012 01:46:31 +0000 (18:46 -0700)]
am
62f03479: Merge "Use new flag for emma instrumented build and limit to apps only" into jb-mr1-dev
* commit '
62f034792d560055c80834981ebffeb3bfa9db39':
Use new flag for emma instrumented build and limit to apps only
Guang Zhu [Sat, 11 Aug 2012 01:44:42 +0000 (18:44 -0700)]
Merge "Use new flag for emma instrumented build and limit to apps only" into jb-mr1-dev
Keun young Park [Sat, 11 Aug 2012 01:28:56 +0000 (18:28 -0700)]
am
f15a11c5: add libstagefright_chromium_http to mini for streaming
* commit '
f15a11c58ddb7343ba89298bc45f264f19755fec':
add libstagefright_chromium_http to mini for streaming
Keun young Park [Fri, 10 Aug 2012 23:59:54 +0000 (16:59 -0700)]
add libstagefright_chromium_http to mini for streaming
Change-Id: I27da54d17698c71d36a5761c6debaeb9f55e5856
The Android Automerger [Fri, 10 Aug 2012 22:45:28 +0000 (15:45 -0700)]
JOO40D
Elliott Hughes [Fri, 10 Aug 2012 22:36:51 +0000 (15:36 -0700)]
Remove TARGET_linux-sh.mk.
SH support is long gone from bionic and dalvik.
Change-Id: I613df5f0062d743686847610737af9a321eec1da
Nick Kralevich [Fri, 10 Aug 2012 21:13:00 +0000 (14:13 -0700)]
am
62481e30: Merge "arm: add --warn-shared-textrel" into jb-mr1-dev
* commit '
62481e30f331c09aed4270cbd6ee87b7a6baeb6e':
arm: add --warn-shared-textrel
Nick Kralevich [Fri, 10 Aug 2012 21:11:14 +0000 (14:11 -0700)]
Merge "arm: add --warn-shared-textrel" into jb-mr1-dev
Nick Kralevich [Fri, 10 Aug 2012 19:51:26 +0000 (12:51 -0700)]
arm: add --warn-shared-textrel
Emit a warning when the static linker detects a shared library
has text relocations. Text relocations make it harder to
share pages across processes, and make it harder to use
certain memory protection features in, for example, SELinux.
This warning will turn into an error in a future change
(via --fatal-warnings)
References: http://www.akkadia.org/drepper/textrelocs.html
Change-Id: I3bc818e3ecdb8a4338668a9e816b6dc1081b7557
Jean-Baptiste Queru [Fri, 10 Aug 2012 19:46:31 +0000 (12:46 -0700)]
am
049d97d7: am
2387857d: am
968f20a4: Merge "MIPS support to *.mk files and envsetup.sh"
* commit '
049d97d7789a9fa29845effb3323203be36e3f97':
MIPS support to *.mk files and envsetup.sh
Jean-Baptiste Queru [Fri, 10 Aug 2012 19:46:29 +0000 (12:46 -0700)]
am
c244634e: am
64b8c6e9: am
6e6d92c4: Merge "Support for MIPS Build targets."
* commit '
c244634e8f9b89a652dc82df1e8f803d01b61509':
Support for MIPS Build targets.
Jean-Baptiste Queru [Fri, 10 Aug 2012 19:43:59 +0000 (12:43 -0700)]
am
2387857d: am
968f20a4: Merge "MIPS support to *.mk files and envsetup.sh"
* commit '
2387857dad06b3437ffcf0c14e2bc9f5956a5888':
MIPS support to *.mk files and envsetup.sh
Jean-Baptiste Queru [Fri, 10 Aug 2012 19:43:59 +0000 (12:43 -0700)]
am
91afae6c: resolved conflicts for merge of
dd14acc3 to jb-mr1-dev
* commit '
91afae6c039d06df83d708834c96d47858406e2a':
Modify full_mips-eng build in line with the full-eng build
Jean-Baptiste Queru [Fri, 10 Aug 2012 19:43:58 +0000 (12:43 -0700)]
am
64b8c6e9: am
6e6d92c4: Merge "Support for MIPS Build targets."
* commit '
64b8c6e936ae713a61c53a85a0badbd7d480e414':
Support for MIPS Build targets.
Jean-Baptiste Queru [Fri, 10 Aug 2012 19:42:18 +0000 (12:42 -0700)]
resolved conflicts for merge of
dd14acc3 to jb-mr1-dev
Change-Id: Ic900c623a7c7fd20c965b8d838caf0f01ceab53f
The Android Open Source Project [Fri, 10 Aug 2012 19:40:20 +0000 (12:40 -0700)]
am
baa97012: am
d4c6a2ed: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '
baa97012143a8601aff04428a179446d8182a4a4':
JZO40
The Android Open Source Project [Fri, 10 Aug 2012 19:36:39 +0000 (12:36 -0700)]
am
d4c6a2ed: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '
d4c6a2edde97a7709086e9a3b7ecb028cecd9bfb':
JZO40
The Android Automerger [Fri, 10 Aug 2012 18:53:27 +0000 (11:53 -0700)]
JOO40C
Jean-Baptiste Queru [Fri, 10 Aug 2012 16:23:42 +0000 (09:23 -0700)]
am
968f20a4: Merge "MIPS support to *.mk files and envsetup.sh"
* commit '
968f20a4c2ffca9a0cf8870bd96c77e65ca61243':
MIPS support to *.mk files and envsetup.sh
Jean-Baptiste Queru [Fri, 10 Aug 2012 16:23:39 +0000 (09:23 -0700)]
am
6e6d92c4: Merge "Support for MIPS Build targets."
* commit '
6e6d92c47acbb976ce47ae4d90406fa56ea68a3a':
Support for MIPS Build targets.
OSDN Git Service
