6135627140
am e388ac10: Merge "Extra protobuf-related support"
...
* commit 'e388ac10b9dfc39f7578b6d222652926265dcffd':
Extra protobuf-related support
2011-01-27 14:25:30 -08:00
e388ac10b9
Merge "Extra protobuf-related support"
2011-01-27 14:19:04 -08:00
d39664126e
am ab81ffe2: am 70b8941f: Merge "Add dnsproxyd to keep in sync with base init.rc"
...
* commit 'ab81ffe2defa3294e09b70372e2179db2377c894':
Add dnsproxyd to keep in sync with base init.rc
2011-01-27 13:57:47 -08:00
ab81ffe2de
am 70b8941f: Merge "Add dnsproxyd to keep in sync with base init.rc"
...
* commit '70b8941f19440592938bdb5c453b16be4d1d8c31':
Add dnsproxyd to keep in sync with base init.rc
2011-01-27 13:55:02 -08:00
c61d4c91b6
Extra protobuf-related support
...
Change-Id: I375d32f0bcb695ccb0603743133034941d584163
2011-01-27 13:49:30 -08:00
70b8941f19
Merge "Add dnsproxyd to keep in sync with base init.rc"
2011-01-27 13:38:33 -08:00
d59072d4d4
Add dnsproxyd to keep in sync with base init.rc
...
Change-Id: I8785cb5a5297c3cc6f3b0152fcae578a9ea89e89
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2011-01-27 13:32:47 -08:00
53cebd72f7
am ad3e0072: am 39f358b7: Merge "Protobuf compiler support in the build system"
...
* commit 'ad3e00724d62e5def2f2552533a62a800e9f3ee9':
Protobuf compiler support in the build system
2011-01-27 13:32:03 -08:00
ad3e00724d
am 39f358b7: Merge "Protobuf compiler support in the build system"
...
* commit '39f358b75f1c6a9a10823bf5e400d1ece0144a05':
Protobuf compiler support in the build system
2011-01-27 13:30:31 -08:00
5a50ecee40
am f273723f: am 1e0055fb: Merge "A few more grandfathered user tags"
...
* commit 'f273723f7710bb127ee1026e05049e4ee5290c8a':
A few more grandfathered user tags
2011-01-27 13:22:36 -08:00
f273723f77
am 1e0055fb: Merge "A few more grandfathered user tags"
...
* commit '1e0055fb91f7b8582cb2979c45532ae01bf7a779':
A few more grandfathered user tags
2011-01-27 13:16:50 -08:00
39f358b75f
Merge "Protobuf compiler support in the build system"
2011-01-27 13:12:09 -08:00
79ee7bf896
Protobuf compiler support in the build system
2011-01-27 12:44:30 -08:00
1e0055fb91
Merge "A few more grandfathered user tags"
2011-01-27 12:17:52 -08:00
2497b6109b
A few more grandfathered user tags
...
Change-Id: I57309b461ec2395da068961f976c904bd3474e88
2011-01-27 12:17:00 -08:00
020e2fc14a
am 928a0304: re-merge from readonly-korg-master - do not merge
...
* commit '928a03043187b7c4843b2c832b589c57b7541e4a':
re-merge from readonly-korg-master - do not merge
2011-01-27 09:24:43 -08:00
928a030431
re-merge from readonly-korg-master - do not merge
...
Change-Id: Ifc1e39261e1fcaefc1e314d994e71115624643a2
2011-01-27 09:21:58 -08:00
46b944dd76
am 1fe74722: am 4a91aa9b: (-s ours) Merge "Add a few more legacy modules that can have user tags - do not merge"
...
* commit '1fe74722b608a66381d186b32b2fb59d254194c7':
Add a few more legacy modules that can have user tags - do not merge
2011-01-27 08:55:43 -08:00
1fe74722b6
am 4a91aa9b: (-s ours) Merge "Add a few more legacy modules that can have user tags - do not merge"
...
* commit '4a91aa9b40d2bffdab04323d100fad3a0e3e6ecc':
Add a few more legacy modules that can have user tags - do not merge
2011-01-27 08:53:44 -08:00
4a91aa9b40
Merge "Add a few more legacy modules that can have user tags - do not merge"
2011-01-27 08:26:25 -08:00
4fd2ef057a
Add a few more legacy modules that can have user tags - do not merge
...
Change-Id: I198d3eb34958e46ccba145bd05452027cba5e464
2011-01-27 08:18:41 -08:00
bbe78df178
am 05d14cb9: Merge "don\'t use the sdkdoc template if the index file is a preview (the features.html doc is no longer used, so removed check for that also)" into gingerbread
...
* commit '05d14cb9f03044e11f7c056dae1e576bb5cd3716':
don't use the sdkdoc template if the index file is a preview (the features.html doc is no longer used, so removed check for that also)
2011-01-21 12:34:06 -08:00
05d14cb9f0
Merge "don't use the sdkdoc template if the index file is a preview (the features.html doc is no longer used, so removed check for that also)" into gingerbread
2011-01-21 12:00:51 -08:00
42d1d32aa0
don't use the sdkdoc template if the index file is a preview
...
(the features.html doc is no longer used, so removed check for that also)
Change-Id: I1985b2e48060337030df53c19051ea363cb3b700
2011-01-21 11:58:56 -08:00
fce88928fe
Revert "Merge commit '50738779' into gingerbread-plus-aosp" - do not merge
...
This reverts commit 7e1ce27c087dfc127096
2011-01-21 07:50:36 -08:00
7e1ce27c08
Merge commit '50738779' into gingerbread-plus-aosp
...
Conflicts:
core/version_defaults.mk
Change-Id: I69ae9d5b3e0532c67c401a8320e69aab5ee66b0f
2011-01-20 18:08:34 -08:00
50738779d9
DO NOT MERGE Fix issue #3373438 : Update GBMR versions
...
Change-Id: Ia334babece0d3cecb19da8ddd240ee300d0ac3ac
2011-01-20 12:17:41 -08:00
7dfc127096
am 54a6b731: Merge "Flesh out the languages_full list with recently added locales." into gingerbread
...
* commit '54a6b731da4029237410f04c1b6cb9b64bf2783f':
Flesh out the languages_full list with recently added locales.
2011-01-18 15:35:46 -08:00
54a6b731da
Merge "Flesh out the languages_full list with recently added locales." into gingerbread
2011-01-18 15:33:39 -08:00
6efeec6a1e
am 755bed4c: Merge "Add support for custom Linux host toolchains when building the SDK."
...
* commit '755bed4cc8ed20449f807feeff44e98c8b20c3ba':
Add support for custom Linux host toolchains when building the SDK.
2011-01-16 14:51:28 -08:00
755bed4cc8
Merge "Add support for custom Linux host toolchains when building the SDK."
2011-01-16 14:30:34 -08:00
60a1e88052
Add support for custom Linux host toolchains when building the SDK.
...
This is needed in order to build Linux SDK binaries that can run
properly on Ubuntu 8.04 (Hardy). By default, the host toolchain
on 10.04 (Lucid) generates machine code that won't run on Hardy
due to GLibc ABI mistmatches.
Note that nothing happens if the new toolchain is not in the
prebuilt tree.
Change-Id: I914f5a303f16b6871759ce5a7178585ed3060870
2011-01-16 19:14:04 +01:00
8e9d20b3c4
am 27016763: merge from gingerbread
...
* commit '27016763c7c0e568fb8eb26ab3d30282f027a72d':
2011-01-14 17:12:54 -08:00
27016763c7
merge from gingerbread
...
Change-Id: I05a6bed8b7275114ce545a7a45f2e13bf5469ec0
2011-01-14 17:09:18 -08:00
1c81f3b01e
Flesh out the languages_full list with recently added locales.
...
Change-Id: I8c43feba15f03e0b204b2d3ef136ea6e6e2e4fe2
2011-01-14 15:23:23 -08:00
4125d8ee68
am a4781e86: Merge from open-source gingerbread
...
* commit 'a4781e867f2e9115ce5b8085576bebf6505bfd00':
CTS: pass vogar expectation location to CollectAllTests.
2011-01-14 13:43:02 -08:00
a4781e867f
Merge from open-source gingerbread
...
Change-Id: I7dce3075bab5831b48a66ef43a32a2be82eda19a
2011-01-14 13:27:48 -08:00
9ac1e65fad
Merge "CTS: pass vogar expectation location to CollectAllTests." into gingerbread
2011-01-14 12:46:35 -08:00
08b964285b
am 66888a7c: docs: update the sdk doc template to remove a bunch of obsolete things and clean up the logic statements for clarity
...
* commit '66888a7c420f911574c59dd10d32f62bada91adb':
docs: update the sdk doc template to remove a bunch of obsolete things and clean up the logic statements for clarity
2011-01-13 20:08:24 -08:00
66888a7c42
docs: update the sdk doc template to remove a bunch of obsolete
...
things and clean up the logic statements for clarity
Change-Id: I75d333370d9e7135abda96c4ef50800f287cea97
2011-01-13 16:35:51 -08:00
fdb400cf20
CTS: pass vogar expectation location to CollectAllTests.
...
Bug 3181338
Change-Id: I740ab73bee39975ad859b5e11b987ca74fd42658
2011-01-07 16:19:02 -08:00
79609e3588
am a712543e: Don\'t prepend ./ before the dirs to be removed
...
* commit 'a712543ec35bd834ad52d47375ab7ec04b8ed3f7':
Don't prepend ./ before the dirs to be removed
2011-01-07 09:23:03 -08:00
ee8fe64709
WAPPushManager, WAP Push over SMS message handler
...
The WAPPushManager is a new, optional service for handling WAP Push
over SMS messages. This service allows a carrier to designate a high
priority handler for specific WAP Push over SMS messages without
affecting other WAP Push over SMS, binary SMS, or SMS text messages.
It is also optional, so that it can be configured out of the target
image resulting in no change in the WAP Push over SMS handling
behavior compared to the current AOSP.
- This patch adds the WAPPushManager to the core build.
Change-Id: Ib139a9dca8b18d4cd50b70c041a346584ef96279
2011-01-07 02:46:57 +09:00
e503fcd52e
am 7e27c8e1: Merge "Pass OUT_DIR variable to atree."
...
* commit '7e27c8e15507d62a0ac0b094bc7cfca15f6cc509':
Pass OUT_DIR variable to atree.
2011-01-05 15:48:24 -08:00
7e27c8e155
Merge "Pass OUT_DIR variable to atree."
2011-01-05 15:35:24 -08:00
7558ad55ce
Pass OUT_DIR variable to atree.
...
Change-Id: Iabbe905341dfe970448682a9dcbb170a04ad5222
2011-01-05 14:58:17 -08:00
a712543ec3
Don't prepend ./ before the dirs to be removed
...
So that installclean can be done properly when OUT_DIR is set to an
obsolute path, such as /buildbot/out_dirs/git_gingerbread.
Bug: 3321625
Change-Id: Ibb9c86e514ebc5f1f821ca04ed9a0a83b37787df
2011-01-04 12:57:58 -08:00
41c423da9d
am 96d3e9b3: Merge "generic_x86 builds don\'t need/use the sparse ext4 format."
...
* commit '96d3e9b3108eb430a01cca41cb06baa1b8eb22ec':
generic_x86 builds don't need/use the sparse ext4 format.
2010-12-29 14:31:01 -08:00
827c662d8f
am e28ae87a: Merge "Use ext4 file system for generic_x86 userdata partition"
...
* commit 'e28ae87af9a9b83ce7e1821d4840edf3b99aec0e':
Use ext4 file system for generic_x86 userdata partition
2010-12-29 14:31:00 -08:00
4bd05717e2
am 670ccf2c: Merge "GB Updates for init.rc and boot command line"
...
* commit '670ccf2c458ed02d2d1e548b48d2eec29cb3d958':
GB Updates for init.rc and boot command line
2010-12-29 14:30:58 -08:00
Jean-Baptiste Queru