OSDN Git Service
Jean-Baptiste Queru [Mon, 11 Jul 2011 16:49:25 +0000 (09:49 -0700)]
Merge "Add PhotoEditor in AOSP builds"
Doug Kwan [Sat, 9 Jul 2011 01:47:25 +0000 (18:47 -0700)]
Disable gcc-4.6's Wunused-but-set-variables warning.
Change-Id: Ia02fa536410b9200beca1d9d120ec448c82e5ca8
Joe Malin [Sat, 9 Jul 2011 00:53:03 +0000 (17:53 -0700)]
am
dcca65cb: am
2c97d30f: am
8cf99f0c: DOC CHANGE: Change GTV icons for home page
* commit '
dcca65cb1d1ca1ae108b417ebd7241f397012b45':
DOC CHANGE: Change GTV icons for home page
Jean-Baptiste Queru [Fri, 8 Jul 2011 23:19:42 +0000 (16:19 -0700)]
Add PhotoEditor in AOSP builds
Change-Id: If0a302701c4b6d2ebfb6b5dd6896d6717411553b
Joe Malin [Fri, 8 Jul 2011 17:38:37 +0000 (10:38 -0700)]
am
2c97d30f: am
8cf99f0c: DOC CHANGE: Change GTV icons for home page
* commit '
2c97d30fefed3430daa356418146d2cbb1f23c8f':
DOC CHANGE: Change GTV icons for home page
Jaikumar Ganesh [Fri, 8 Jul 2011 16:40:27 +0000 (09:40 -0700)]
Merge "Add Bluetooth health to the PRODUCT_PACKAGE."
Joe Malin [Fri, 8 Jul 2011 16:29:29 +0000 (09:29 -0700)]
am
8cf99f0c: DOC CHANGE: Change GTV icons for home page
* commit '
8cf99f0ccee8ecc95183f939d633a514e7eebdfb':
DOC CHANGE: Change GTV icons for home page
Jaikumar Ganesh [Fri, 8 Jul 2011 01:08:15 +0000 (18:08 -0700)]
Add Bluetooth health to the PRODUCT_PACKAGE.
Change-Id: Ifb668f74c09a321eea9d2785f7574cd637aff092
Jean-Baptiste Queru [Thu, 7 Jul 2011 22:48:04 +0000 (15:48 -0700)]
Merge "Add VideoEditor to full builds"
Jean-Baptiste Queru [Thu, 7 Jul 2011 22:30:15 +0000 (15:30 -0700)]
Add VideoEditor to full builds
Change-Id: Iaaecaa24b25c67642197d4926aa7f350991abf60
The Android Open Source Project [Thu, 7 Jul 2011 22:22:25 +0000 (15:22 -0700)]
Reconcile with gingerbread-release honeycomb-mr2-release honeycomb-LTE-release
Change-Id: I8ea53082a2a9d54a8004ff834d2344b989ca0fbf
android-merger [Thu, 7 Jul 2011 21:45:05 +0000 (14:45 -0700)]
GRJ90C - a test build
Change-Id: Ieabc475f7e45db1d79a56036fdb377c52bd8f1ac
Doug Zongker [Thu, 7 Jul 2011 18:24:41 +0000 (11:24 -0700)]
Merge "Prevent "::" in PATH on multiple lunch"
android-merger [Thu, 7 Jul 2011 17:40:48 +0000 (10:40 -0700)]
GRJ90B - a test build
Change-Id: I54aefd71dc35381aed8ab1fbf99280d566520c0c
Ying Wang [Thu, 7 Jul 2011 16:29:19 +0000 (09:29 -0700)]
Merge "Enable LOCAL_STRIP_MODULE for prebuilt binaries"
The Android Automerger [Thu, 7 Jul 2011 14:19:53 +0000 (07:19 -0700)]
HLK07
Change-Id: I9442d2198c19df9fadfcb19868cde304c4088444
The Android Automerger [Thu, 7 Jul 2011 14:19:47 +0000 (07:19 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
Ji-Hwan Lee [Wed, 6 Jul 2011 18:10:14 +0000 (03:10 +0900)]
Enable LOCAL_STRIP_MODULE for prebuilt binaries
Currently, prebuilt binaries with debug symbols are installed unstripped.
There are only a few of prebuilt shared library (that I'm trying to fix),
so I can do this manually by making intermediate target and applying
TARGET_STRIP, each of them, one by one.
But dynamic_binary.mk has more features than stripping binaries
(like copying unstripped binaries to symbols directory)
and if I do it manually, they will lose all the benefits.
Note that this doesn't change anything when LOCAL_STRIP_MODULE is not set.
I actually tried to force strip every BUILD_PREBUILT'ed modules,
but there were a few problems:
- Some packages are not installed (i.e. not in PRODUCT_PACAKGES)
but are built (i.e. in ALL_MODULES). And some of them are built in spite
that they do not have appropriate prebuilt shared library for TARGET_ARCH.
Stripping them causes "unknown format".
- Some prebuilt modules set LOCAL_MODULE_CLASS incorrectly.
Example is default.supp of external/valgrind/main, which should be ETC,
not SHARED_LIBRARY.
Both are better fixed, but I concluded that it's better to be conservative.
Bug:
4585734
Change-Id: If71723b1d76007d45b02429ea5161a8265dd5b6d
The Android Automerger [Thu, 7 Jul 2011 00:45:44 +0000 (17:45 -0700)]
Set build id to HTJ85B
Change-Id: I00c0a1209127ade88bf49bb821234c0da04ca029
Joe Malin [Fri, 1 Jul 2011 19:51:48 +0000 (12:51 -0700)]
DOC CHANGE: Change GTV icons for home page
Change-Id: If7172345173b165350417ab52f706d6444dc4d96
The Android Automerger [Wed, 6 Jul 2011 20:01:56 +0000 (13:01 -0700)]
HTK06
Change-Id: I61cda8058f46a955ed7217f90ab5d0601627b300
The Android Open Source Project [Wed, 6 Jul 2011 14:35:15 +0000 (07:35 -0700)]
Reconcile with gingerbread-release honeycomb-LTE-release
Change-Id: Ide009ee977f3b2a5344dcb4843a9274380658560
The Android Automerger [Wed, 6 Jul 2011 14:13:59 +0000 (07:13 -0700)]
HLK06
Change-Id: Id9a931f0e2f1e9d11ee40335c19890206541279a
The Android Automerger [Wed, 6 Jul 2011 14:13:54 +0000 (07:13 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
Ying Wang [Tue, 5 Jul 2011 22:37:22 +0000 (15:37 -0700)]
Remove vpn from FRAMEWORKS_BASE_SUBDIRS
To eliminate build warning.
Reference commit:
44e27b5c74b5f441973561a4f945cb58e0cc45a4
which removed framework/base/vpn.
Change-Id: I539e4bc2a4008c8b9eed74dd53eec1f55db3abe5
The Android Automerger [Tue, 5 Jul 2011 14:15:28 +0000 (07:15 -0700)]
HLK05
Change-Id: I4c789558d8e510bf250ca5ccbfce292dc39dbd5a
The Android Automerger [Tue, 5 Jul 2011 14:15:24 +0000 (07:15 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Mon, 4 Jul 2011 14:18:52 +0000 (07:18 -0700)]
HLK04
Change-Id: Ib862c2fb576f0ce3becb00a576db2566ec319823
The Android Automerger [Mon, 4 Jul 2011 14:18:47 +0000 (07:18 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
Ji-Hwan Lee [Mon, 4 Jul 2011 05:09:47 +0000 (14:09 +0900)]
Prevent "::" in PATH on multiple lunch
Running lunch multiple times results in inserting "::" each time.
"::" is an empty path element, which is treated as a current directory.
Change-Id: I770f4c1f40224ea91fd7989b0ea47d3cd081c24f
The Android Automerger [Fri, 1 Jul 2011 22:37:50 +0000 (15:37 -0700)]
HLK01B
Change-Id: I94bde12eeace63caa24bc545d97e8af49a7d53e5
The Android Automerger [Fri, 1 Jul 2011 22:37:44 +0000 (15:37 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
Eino-Ville Talvala [Wed, 29 Jun 2011 17:03:19 +0000 (10:03 -0700)]
Add mobile filter framework java library to core target files.
Change-Id: Ia4892d8c49be905ec68423224ca44c8558edbdb8
Mike Lockwood [Fri, 1 Jul 2011 16:31:47 +0000 (12:31 -0400)]
Remove obsolete persist.service.adb.enable property from default.prop
Change-Id: I59a2da01eddfc1fa775e027a86f7f818a146a6b0
Signed-off-by: Mike Lockwood <lockwood@android.com>
The Android Automerger [Fri, 1 Jul 2011 14:19:24 +0000 (07:19 -0700)]
HLK01
Change-Id: I3c25b979402a5843c5bcba58336dc0d9a805503c
The Android Automerger [Fri, 1 Jul 2011 14:19:18 +0000 (07:19 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Thu, 30 Jun 2011 14:19:12 +0000 (07:19 -0700)]
HLJ91
Change-Id: Ib4ae3dd4de51cbc0f736e5db90670bbea9264b7e
The Android Automerger [Thu, 30 Jun 2011 14:19:06 +0000 (07:19 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
android-merger [Wed, 29 Jun 2011 18:16:15 +0000 (11:16 -0700)]
GRJ90
Change-Id: I76536224052c1e921ac7887bd772bcdf725f36b2
The Android Automerger [Wed, 29 Jun 2011 14:18:20 +0000 (07:18 -0700)]
HLJ90
Change-Id: Ic5c6aa3728e51af7fce0ca2d8afcf79bc17dfd80
The Android Automerger [Wed, 29 Jun 2011 14:18:16 +0000 (07:18 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Tue, 28 Jun 2011 22:11:24 +0000 (15:11 -0700)]
HLJ89B
Change-Id: I5c5c7e0355a70123aa3a598bf33055b9fdc75cc5
The Android Automerger [Tue, 28 Jun 2011 22:11:20 +0000 (15:11 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Tue, 28 Jun 2011 14:19:46 +0000 (07:19 -0700)]
HLJ89
Change-Id: I2566542dd48247e7010606b4ba0d6edab81e6c67
The Android Automerger [Tue, 28 Jun 2011 14:19:38 +0000 (07:19 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
Evgeniy Stepanov [Tue, 21 Jun 2011 13:08:49 +0000 (17:08 +0400)]
Add .gnu_debuglink when stripping DSOs.
This is used by debug tools to find symbols for the stripped binary.
Adds ~70 bytes to each DSO, ~25000 bytes total, which is about 0.01% of the
system image.
This change only affects -eng and -userdebug builds, and does not affect -user.
Change-Id: I0c92a9e09fbc97184dea66813923568cbcc2a3fe
The Android Open Source Project [Mon, 27 Jun 2011 23:04:37 +0000 (16:04 -0700)]
Reconcile with gingerbread-release honeycomb-mr2-release honeycomb-LTE-release
Change-Id: I6592f9416213bdf7c4190297b2edf08a5de9ce45
David 'Digit' Turner [Mon, 27 Jun 2011 21:14:33 +0000 (14:14 -0700)]
am
11e1d5fb: am
6236d356: am
b92c7a2c: am
cac8e557: Merge "sdk: provide ABI-dependent atree files"
* commit '
11e1d5fb3a33de9c5aad7c21294b8019a0f042b8':
sdk: provide ABI-dependent atree files
The Android Automerger [Mon, 27 Jun 2011 15:17:16 +0000 (08:17 -0700)]
HLJ88
Change-Id: I886289d92b6850bd83c86cd48e182025ab137a0c
The Android Automerger [Mon, 27 Jun 2011 15:17:08 +0000 (08:17 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Sat, 25 Jun 2011 18:49:31 +0000 (11:49 -0700)]
HLJ86
Change-Id: Ie9edd591b670684c633cabe2c475e7fcccb69e04
The Android Automerger [Sat, 25 Jun 2011 18:49:26 +0000 (11:49 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Sat, 25 Jun 2011 00:20:42 +0000 (17:20 -0700)]
HTJ85
Change-Id: Id7699e3bfdbc8a67d12f321a996e8eaa23e335ad
The Android Automerger [Sat, 25 Jun 2011 00:20:33 +0000 (17:20 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
android-merger [Fri, 24 Jun 2011 18:18:22 +0000 (11:18 -0700)]
GRJ85
Change-Id: I5f70ae7fcc5f1ff98c050d9e1a3a819fc2acbbfa
Jean-Baptiste Queru [Fri, 24 Jun 2011 15:48:31 +0000 (08:48 -0700)]
Revert "resolved conflicts for merge of
972433bd to master"
This reverts commit
5d0ec1aebb952601d98c2dad70ef369f75f2b44a, reversing
changes made to
4839e47309ccefc41d4e7055f701104995472723.
The Android Open Source Project [Fri, 24 Jun 2011 15:13:19 +0000 (08:13 -0700)]
Reconcile with honeycomb-mr1-release
Change-Id: I200a7f476eaefab1044101fa5d4ab022c332f159
The Android Open Source Project [Fri, 24 Jun 2011 15:08:33 +0000 (08:08 -0700)]
Reconcile with honeycomb-mr2-release honeycomb-LTE-release
Change-Id: I07d4e3193af523ef98d93716d0ec9419b138792a
The Android Automerger [Fri, 24 Jun 2011 14:20:06 +0000 (07:20 -0700)]
HLJ85
Change-Id: I30986e03b57683a77656b412683d448dfa725f79
The Android Automerger [Fri, 24 Jun 2011 14:19:57 +0000 (07:19 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
David 'Digit' Turner [Fri, 24 Jun 2011 11:45:26 +0000 (13:45 +0200)]
resolved conflicts for merge of
972433bd to master
Change-Id: I1320aa02110af4b1cf25d2afde1bd4b587fcb10f
Raphael [Thu, 23 Jun 2011 21:31:21 +0000 (14:31 -0700)]
am
2ec35cc8: am
4aed6434: am
0b6ece9d: SDK: properly strip all SDK llvm-rs-cc linux binaries.
* commit '
2ec35cc88f10bcd11d3a193d58a1ab245caebce5':
SDK: properly strip all SDK llvm-rs-cc linux binaries.
David 'Digit' Turner [Thu, 23 Jun 2011 21:29:59 +0000 (14:29 -0700)]
am
a85ebfb0: am
fa112f98: am
c134712f: am
04b49109: Merge "Turn-off implicit GNU Make RC/SCCS rules"
* commit '
a85ebfb059080865a549539a9d2758c4e8b8aeed':
Turn-off implicit GNU Make RC/SCCS rules
Raphael [Thu, 23 Jun 2011 20:52:29 +0000 (13:52 -0700)]
resolved conflicts for merge of
732936d9 to master
Change-Id: I1fc667057aebbbef19bde746ebcc650ac0e8c35c
David 'Digit' Turner [Thu, 23 Jun 2011 20:13:20 +0000 (13:13 -0700)]
am
6236d356: am
b92c7a2c: am
cac8e557: Merge "sdk: provide ABI-dependent atree files"
* commit '
6236d356a01150bc517bd639398df704735cc0fc':
sdk: provide ABI-dependent atree files
David 'Digit' Turner [Thu, 23 Jun 2011 20:08:35 +0000 (13:08 -0700)]
am
b92c7a2c: am
cac8e557: Merge "sdk: provide ABI-dependent atree files"
* commit '
b92c7a2c1293d2921739a4d7210b4a0d1c99156b':
sdk: provide ABI-dependent atree files
David 'Digit' Turner [Thu, 23 Jun 2011 19:54:41 +0000 (12:54 -0700)]
am
cac8e557: Merge "sdk: provide ABI-dependent atree files"
* commit '
cac8e55714424d385da5b40e5952dc539e510454':
sdk: provide ABI-dependent atree files
David 'Digit' Turner [Thu, 23 Jun 2011 19:18:49 +0000 (12:18 -0700)]
Merge "sdk: provide ABI-dependent atree files"
Raphael Moll [Thu, 23 Jun 2011 15:16:38 +0000 (08:16 -0700)]
am
de50d0ab: am
d6605405: am
7f5a314a: am
169c19cc: Merge "Envsetup: Cygwin doesn\'t have \'ps -o command\'."
* commit '
de50d0ab2008cbf836dc4fcbe9131a2071265946':
Envsetup: Cygwin doesn't have 'ps -o command'.
The Android Open Source Project [Thu, 23 Jun 2011 14:27:04 +0000 (07:27 -0700)]
Reconcile with gingerbread-release
Change-Id: I52a808eebd1d2ca2711fe13f92ffc71c5ff7ab0a
The Android Automerger [Thu, 23 Jun 2011 14:19:19 +0000 (07:19 -0700)]
HLJ84
Change-Id: I124e43579c8be456a16036a5e709a5cc6ffa11a6
The Android Automerger [Thu, 23 Jun 2011 14:19:13 +0000 (07:19 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
David 'Digit' Turner [Thu, 23 Jun 2011 12:28:08 +0000 (05:28 -0700)]
am
18447019: am
4b227c70: am
f9f83ed1: Merge "emulator: Enable dex-preoptimization"
* commit '
1844701942de578bab6c7f17e14ef695bb8ed7c1':
emulator: Enable dex-preoptimization
David 'Digit' Turner [Thu, 23 Jun 2011 12:07:30 +0000 (05:07 -0700)]
am
4b227c70: am
f9f83ed1: Merge "emulator: Enable dex-preoptimization"
* commit '
4b227c708c1014bd773085ae275275744f239435':
emulator: Enable dex-preoptimization
David 'Digit' Turner [Thu, 23 Jun 2011 11:49:56 +0000 (04:49 -0700)]
am
f9f83ed1: Merge "emulator: Enable dex-preoptimization"
* commit '
f9f83ed19e83313ffaf542b148886bcb860ca12e':
emulator: Enable dex-preoptimization
David 'Digit' Turner [Thu, 23 Jun 2011 11:24:50 +0000 (04:24 -0700)]
Merge "emulator: Enable dex-preoptimization"
David 'Digit' Turner [Thu, 23 Jun 2011 10:49:02 +0000 (12:49 +0200)]
sdk: provide ABI-dependent atree files
This patch allows development/sdk/ to provide ABI-specific .atree
files. This is useful to copy prebuilt CPU model-specific files
to the SDK platform image directory.
This is needed to deal with the fact that for ARMv7 platform builds,
the kernel image to use is prebuilt/android-arm/kernel-qemu-armv7 instead
of prebuilt/android-arm/kernel/qemu
Change-Id: Icdca751852c01421fccf196436a9bc1114ea90f7
Raphael [Thu, 23 Jun 2011 02:10:23 +0000 (19:10 -0700)]
am
4aed6434: am
0b6ece9d: SDK: properly strip all SDK llvm-rs-cc linux binaries.
* commit '
4aed64341c6cff484c9b78fed3d13131049858c9':
SDK: properly strip all SDK llvm-rs-cc linux binaries.
Raphael [Thu, 23 Jun 2011 02:05:16 +0000 (19:05 -0700)]
am
0b6ece9d: SDK: properly strip all SDK llvm-rs-cc linux binaries.
* commit '
0b6ece9dafcf6f06dd4418829434cdc4376375a3':
SDK: properly strip all SDK llvm-rs-cc linux binaries.
David 'Digit' Turner [Thu, 23 Jun 2011 01:05:06 +0000 (18:05 -0700)]
am
fa112f98: am
c134712f: am
04b49109: Merge "Turn-off implicit GNU Make RC/SCCS rules"
* commit '
fa112f982241fc3efa0129094e87a34f2317f41e':
Turn-off implicit GNU Make RC/SCCS rules
Raphael [Fri, 27 May 2011 21:02:31 +0000 (14:02 -0700)]
SDK: properly strip all SDK llvm-rs-cc linux binaries.
Change-Id: Id3f024e90ef04eff4cc13a2202fcc9e94c5ac72f
Ying Wang [Wed, 22 Jun 2011 23:37:12 +0000 (16:37 -0700)]
Merge "Use the host STL for host native test."
The Android Automerger [Wed, 22 Jun 2011 23:35:15 +0000 (16:35 -0700)]
HTJ83
Change-Id: I8d46ec9b2e924a31ea8b4f41c3371c6675c3b5d3
The Android Automerger [Wed, 22 Jun 2011 23:34:28 +0000 (16:34 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
Ying Wang [Wed, 22 Jun 2011 23:01:48 +0000 (16:01 -0700)]
Use the host STL for host native test.
Bug:
4584343
Change-Id: I420b7d955142d57993295cec12e54c94d5a75b88
David 'Digit' Turner [Wed, 22 Jun 2011 22:53:31 +0000 (15:53 -0700)]
am
c134712f: am
04b49109: Merge "Turn-off implicit GNU Make RC/SCCS rules"
* commit '
c134712ffa9e6617df46334a6293ddd80e05cf98':
Turn-off implicit GNU Make RC/SCCS rules
David 'Digit' Turner [Wed, 22 Jun 2011 22:28:56 +0000 (15:28 -0700)]
am
04b49109: Merge "Turn-off implicit GNU Make RC/SCCS rules"
* commit '
04b49109710f74c59fb65b09b2028e5de7901f67':
Turn-off implicit GNU Make RC/SCCS rules
David 'Digit' Turner [Wed, 22 Jun 2011 21:40:52 +0000 (14:40 -0700)]
Merge "Turn-off implicit GNU Make RC/SCCS rules"
Raphael [Wed, 22 Jun 2011 21:35:32 +0000 (14:35 -0700)]
resolved conflicts for merge of
8508a073 to honeycomb-plus-aosp
Change-Id: I376928881adb0e9fd62fabc1e21542bf0d700ca2
David 'Digit' Turner [Wed, 15 Jun 2011 23:32:20 +0000 (01:32 +0200)]
emulator: Enable dex-preoptimization
This enables the Dex pre-optimization for emulator-specific builds.
The idea is to speed up the initial boot sequence of an SDK AVD by
avoiding the costly on-device preopt pass that is performed otherwise
the first time the AVD is launched.
Benchmarking shows reductions in first boot time from 1m30s to 40s
on a 2.4GHz Xeon when emulating the AOSP master ToT.
Change-Id: I67a9ce9791220c202817864c6e83dc8fd9cbc027
David 'Digit' Turner [Wed, 22 Jun 2011 21:18:57 +0000 (23:18 +0200)]
Turn-off implicit GNU Make RC/SCCS rules
This small patch prevents GNU Make from stating RCS and SCCS
specific files on the filesystem. This makes the output of
"make -d" slightly more readable, and also reduces the no-change
time on AOSP master by a bit less than a second on average.
Change-Id: Ifa50ace32e8689717956d7247b0d6f53ef72b7a1
Raphael Moll [Wed, 22 Jun 2011 17:44:52 +0000 (10:44 -0700)]
am
d6605405: am
7f5a314a: am
169c19cc: Merge "Envsetup: Cygwin doesn\'t have \'ps -o command\'."
* commit '
d66054056311a369a090cd1aae2557454fdc7ecc':
Envsetup: Cygwin doesn't have 'ps -o command'.
Raphael Moll [Wed, 22 Jun 2011 17:40:08 +0000 (10:40 -0700)]
am
6e65ddb2: am
cb84196f: Merge "Lunch: don\'t use a toolchain that doesn\'t exist."
* commit '
6e65ddb20aa82522b3fdc72c87d365f22e9a43ed':
Lunch: don't use a toolchain that doesn't exist.
Raphael Moll [Wed, 22 Jun 2011 17:40:01 +0000 (10:40 -0700)]
am
7f5a314a: am
169c19cc: Merge "Envsetup: Cygwin doesn\'t have \'ps -o command\'."
* commit '
7f5a314ab6dacb72eb37c87e064b21dbd44ccc7b':
Envsetup: Cygwin doesn't have 'ps -o command'.
Raphael Moll [Wed, 22 Jun 2011 17:35:22 +0000 (10:35 -0700)]
am
cb84196f: Merge "Lunch: don\'t use a toolchain that doesn\'t exist."
* commit '
cb84196f3ae966b2a4a0d16f0cc314a855b6dad6':
Lunch: don't use a toolchain that doesn't exist.
Raphael Moll [Wed, 22 Jun 2011 17:35:20 +0000 (10:35 -0700)]
am
169c19cc: Merge "Envsetup: Cygwin doesn\'t have \'ps -o command\'."
* commit '
169c19ccb566d72a8ea142afb2550f9c54c5fea9':
Envsetup: Cygwin doesn't have 'ps -o command'.
Raphael Moll [Wed, 22 Jun 2011 17:18:20 +0000 (10:18 -0700)]
Merge "Lunch: don't use a toolchain that doesn't exist."
Raphael Moll [Wed, 22 Jun 2011 17:17:02 +0000 (10:17 -0700)]
Merge "Envsetup: Cygwin doesn't have 'ps -o command'."
The Android Automerger [Wed, 22 Jun 2011 14:21:19 +0000 (07:21 -0700)]
HLJ83
Change-Id: Ic316d9029dc96afc24c2622063656d849a4fcad8
The Android Automerger [Wed, 22 Jun 2011 14:21:14 +0000 (07:21 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
OSDN Git Service
