OSDN Git Service
Jean-Baptiste Queru [Thu, 10 Feb 2011 22:48:35 +0000 (14:48 -0800)]
Jean-Baptiste Queru [Thu, 10 Feb 2011 21:22:01 +0000 (13:22 -0800)]
Jean-Baptiste Queru [Thu, 10 Feb 2011 20:58:01 +0000 (12:58 -0800)]
Merge "no-op"
Jean-Baptiste Queru [Thu, 10 Feb 2011 20:57:31 +0000 (12:57 -0800)]
no-op
Change-Id: Ifd90e66fe63d429f9998a36f72553e2aacf3fc7c
Ying Wang [Tue, 8 Feb 2011 19:22:02 +0000 (11:22 -0800)]
am
d239c1bd: Fix dependency of prebuilt target non-static Java libraries.
* commit '
d239c1bd1bef3067acebcd9d87a7be68d6eb4b98':
Fix dependency of prebuilt target non-static Java libraries.
Ying Wang [Tue, 1 Feb 2011 20:57:45 +0000 (12:57 -0800)]
Fix dependency of prebuilt target non-static Java libraries.
Change-Id: Ib9a01e1d0cf1eed57de0dc7706ee12125212ba67
Scott Main [Mon, 7 Feb 2011 23:34:50 +0000 (15:34 -0800)]
am
4c8ae40a: docs: remove preliminary watermark from docs
* commit '
4c8ae40abba83921bd98eb6636b5e3d753bbd183':
docs: remove preliminary watermark from docs
Scott Main [Mon, 7 Feb 2011 22:26:45 +0000 (14:26 -0800)]
docs: remove preliminary watermark from docs
Change-Id: I452596cdc5b87effdb958ff963d9aa80ebec5d37
Scott Main [Fri, 4 Feb 2011 23:20:42 +0000 (15:20 -0800)]
am
61281638: am
886e5aa7: Merge "fix api level filtering script to compare integers, not strings" into gingerbread
* commit '
612816385a5c6ca2bd54d027617c42c34338682f':
fix api level filtering script to compare integers, not strings
Raphael [Fri, 4 Feb 2011 23:20:36 +0000 (15:20 -0800)]
am
3e01b483: (-s ours) am
843c6e25: merge "SDK: stub the maps.jar from the google_apis addon." from HC. Do not merge.
* commit '
3e01b483708d0fc3766fa4adff2ae8b354de75dc':
merge "SDK: stub the maps.jar from the google_apis addon." from HC. Do not merge.
Scott Main [Fri, 4 Feb 2011 23:17:04 +0000 (15:17 -0800)]
am
4b311bc9: Merge "fix api level filtering script to compare integers, not strings" into honeycomb
* commit '
4b311bc91a7851b204c63e678b0213504125d3aa':
fix api level filtering script to compare integers, not strings
Scott Main [Fri, 4 Feb 2011 23:14:57 +0000 (15:14 -0800)]
am
886e5aa7: Merge "fix api level filtering script to compare integers, not strings" into gingerbread
* commit '
886e5aa742c1667de3ca5b628bf6865948ef4513':
fix api level filtering script to compare integers, not strings
Scott Main [Fri, 4 Feb 2011 23:14:45 +0000 (15:14 -0800)]
Merge "fix api level filtering script to compare integers, not strings" into honeycomb
Scott Main [Fri, 4 Feb 2011 23:13:04 +0000 (15:13 -0800)]
fix api level filtering script to compare integers, not strings
Change-Id: I8f0e44ec2bf0833a0d547a3795ee31ee0dc69d8a
Scott Main [Fri, 4 Feb 2011 23:11:59 +0000 (15:11 -0800)]
Merge "fix api level filtering script to compare integers, not strings" into gingerbread
Scott Main [Fri, 4 Feb 2011 23:10:33 +0000 (15:10 -0800)]
fix api level filtering script to compare integers, not strings
Change-Id: I4d0d6c40dd5c1f8470567ef30f0f7500b442fbe5
Raphael [Fri, 4 Feb 2011 22:49:17 +0000 (14:49 -0800)]
am
843c6e25: merge "SDK: stub the maps.jar from the google_apis addon." from HC. Do not merge.
* commit '
843c6e2530a0783ae1a5a4758cb5e76ad975ae72':
merge "SDK: stub the maps.jar from the google_apis addon." from HC. Do not merge.
Raphael [Fri, 4 Feb 2011 06:59:27 +0000 (22:59 -0800)]
merge "SDK: stub the maps.jar from the google_apis addon." from HC. Do not merge.
Depends on change
8252cdea from development to get the
verbose/quiet flag for mkstub.
Change-Id: I1ac97023570a4fc8a0b9dd50db429c55184ec88c
Scott Main [Fri, 4 Feb 2011 19:48:59 +0000 (11:48 -0800)]
am
8cf6d9e3: Merge "tweak header css for more distinction" into honeycomb
* commit '
8cf6d9e3ae1f7a18c49121c578fe1f5f05371342':
tweak header css for more distinction
Scott Main [Fri, 4 Feb 2011 19:47:18 +0000 (11:47 -0800)]
Merge "tweak header css for more distinction" into honeycomb
Raphael [Fri, 4 Feb 2011 19:12:25 +0000 (11:12 -0800)]
am
30e07075: SDK: stub the maps.jar from the google_apis addon.
* commit '
30e0707531268343e11dfeb51f28ccdacd7f9875':
SDK: stub the maps.jar from the google_apis addon.
Raphael [Fri, 4 Feb 2011 06:59:27 +0000 (22:59 -0800)]
SDK: stub the maps.jar from the google_apis addon.
Depends on change
8252cdea from development to get the
verbose/quiet flag for mkstub.
Change-Id: I5f4e766613576828147c97be8d38e97fe1035672
Scott Main [Fri, 4 Feb 2011 02:11:05 +0000 (18:11 -0800)]
tweak header css for more distinction
Change-Id: I1d63b7587917bfde3df5547b5648610d86083d6a
Raphael Moll [Thu, 3 Feb 2011 19:45:21 +0000 (11:45 -0800)]
am
ed191898: am
a15717c9: am
6b7b53cb: Merge "SDK: Enable "make sdk/common" under Windows"
* commit '
ed19189877a3a380074e8e76969ef23689cec8fd':
SDK: Enable "make sdk/common" under Windows
Raphael Moll [Thu, 3 Feb 2011 19:42:34 +0000 (11:42 -0800)]
am
a15717c9: am
6b7b53cb: Merge "SDK: Enable "make sdk/common" under Windows"
* commit '
a15717c9905e32f2724645e3734567c40d8d3eb0':
SDK: Enable "make sdk/common" under Windows
Raphael Moll [Thu, 3 Feb 2011 18:54:05 +0000 (10:54 -0800)]
am
6b7b53cb: Merge "SDK: Enable "make sdk/common" under Windows"
* commit '
6b7b53cb36bda3b2aa1de94654cd73785d67c267':
SDK: Enable "make sdk/common" under Windows
Raphael Moll [Thu, 3 Feb 2011 18:45:50 +0000 (10:45 -0800)]
Merge "SDK: Enable "make sdk/common" under Windows"
Raphael [Thu, 3 Feb 2011 17:16:38 +0000 (09:16 -0800)]
am
79e1d2cf: am
6b6e8114: am
4167b2ba: Merge "SDK: Strip llvm-rs-cc in SDK."
* commit '
79e1d2cf99754f81137c0f390d0e1fd898e52277':
SDK: Strip llvm-rs-cc in SDK.
Raphael [Thu, 3 Feb 2011 17:05:07 +0000 (09:05 -0800)]
am
6b6e8114: am
4167b2ba: Merge "SDK: Strip llvm-rs-cc in SDK."
* commit '
6b6e8114810bb26a64e1d8d9814fdfadb90c3848':
SDK: Strip llvm-rs-cc in SDK.
Raphael [Thu, 3 Feb 2011 16:56:22 +0000 (08:56 -0800)]
am
4167b2ba: Merge "SDK: Strip llvm-rs-cc in SDK."
* commit '
4167b2bae58b445cfaf15291a7aa6b0ccd025596':
SDK: Strip llvm-rs-cc in SDK.
Brian Swetland [Thu, 3 Feb 2011 00:17:50 +0000 (16:17 -0800)]
am
678c7ac9: (-s ours) am
d7798a7e: fix TINY ANDROID yet again...
* commit '
678c7ac997ba5daf09664d3e9b26f1c4a493b99e':
fix TINY ANDROID yet again...
Raphael Moll [Wed, 2 Feb 2011 23:59:46 +0000 (15:59 -0800)]
SDK: Enable "make sdk/common" under Windows
Change-Id: Id9cba159f434fb18f6e3b648954b3f8ddb580dc0
Raphael [Wed, 2 Feb 2011 23:52:40 +0000 (15:52 -0800)]
am
7a6a9c35: SDK: Strip llvm-rs-cc in SDK.
* commit '
7a6a9c3528d997a1cb3a03eca3c0c11b14792449':
SDK: Strip llvm-rs-cc in SDK.
Brian Swetland [Wed, 2 Feb 2011 23:23:20 +0000 (15:23 -0800)]
am
d7798a7e: fix TINY ANDROID yet again...
* commit '
d7798a7e1b3241c49d7c8325cf14ac608350b719':
fix TINY ANDROID yet again...
Brian Swetland [Wed, 2 Feb 2011 23:20:50 +0000 (15:20 -0800)]
fix TINY ANDROID yet again...
Change-Id: If52e1387c590be5ef467280ab2d1b56b8a823cd0
Raphael [Wed, 2 Feb 2011 21:41:13 +0000 (13:41 -0800)]
Merge "SDK: Strip llvm-rs-cc in SDK."
Ed Heyl [Wed, 2 Feb 2011 21:12:16 +0000 (13:12 -0800)]
Merge commit '
1eda8628' into honeycomb-plus-aosp
Change-Id: I07948d5d76f4a25ae93ebd6c7ba0d520ef5b61c0
Raphael [Tue, 1 Feb 2011 21:30:00 +0000 (13:30 -0800)]
SDK: Strip llvm-rs-cc in SDK.
SDK Bug:
3394374
Change-Id: I2b0e46d9f94d488611bd79193f4a11cc0f36be51
Raphael [Tue, 1 Feb 2011 21:30:00 +0000 (13:30 -0800)]
SDK: Strip llvm-rs-cc in SDK.
SDK Bug:
3394374
Change-Id: I728112795ad40a31a1b4c476e043ef213241c617
Ed Heyl [Wed, 2 Feb 2011 18:03:25 +0000 (10:03 -0800)]
set ID back to honeycomb (please do not merge)
Change-Id: I469ccbb2a556d3aeaedb9d0a89bda1d77aef6b90
Scott Main [Wed, 2 Feb 2011 05:00:05 +0000 (21:00 -0800)]
am
463694a4: (-s ours) am
0fe9974c: cherrypick Change-Id: Ib8a7ae66f0dc6db6a2c8f2a79238d95e67c627f3 backport some style changes for notes from master to gb
* commit '
463694a4f54de3d16de21b7aa9a7030b73fbd2e5':
cherrypick Change-Id: Ib8a7ae66f0dc6db6a2c8f2a79238d95e67c627f3 backport some style changes for notes from master to gb
Scott Main [Wed, 2 Feb 2011 04:52:23 +0000 (20:52 -0800)]
am
0fe9974c: cherrypick Change-Id: Ib8a7ae66f0dc6db6a2c8f2a79238d95e67c627f3 backport some style changes for notes from master to gb
* commit '
0fe9974c38e41a2aa386d5744d1a75d8bd26b1bc':
cherrypick Change-Id: Ib8a7ae66f0dc6db6a2c8f2a79238d95e67c627f3 backport some style changes for notes from master to gb
Scott Main [Wed, 2 Feb 2011 04:32:18 +0000 (20:32 -0800)]
cherrypick Change-Id: Ib8a7ae66f0dc6db6a2c8f2a79238d95e67c627f3
backport some style changes for notes from master to gb
Change-Id: I4a7c6cfcadade5d90069ecab1edc694cb333430e
Ying Wang [Wed, 2 Feb 2011 00:37:30 +0000 (16:37 -0800)]
am
9c0f3e35: Build only userdata.img.
* commit '
9c0f3e355194d1c43bf70f35f953d6a2babc815a':
Build only userdata.img.
Ying Wang [Tue, 1 Feb 2011 22:52:05 +0000 (14:52 -0800)]
Build only userdata.img.
Use build command like:
$make -j16 showcommands userdataimage dist TARGET_PRODUCT=trygon_with_data_preloaded TARGET_BUILD_VARIANT=user
Change-Id: I964490e03090c3696d1595c92363273e35cfaed7
Scott Main [Tue, 1 Feb 2011 02:52:09 +0000 (18:52 -0800)]
am
e104f773: Merge "docs: modify style for toggle stuff so text isn\'t blue" into honeycomb
* commit '
e104f7731807c28d6c23eef7b88e1f53e1f7484a':
docs: modify style for toggle stuff so text isn't blue
Scott Main [Tue, 1 Feb 2011 01:51:13 +0000 (17:51 -0800)]
Merge "docs: modify style for toggle stuff so text isn't blue" into honeycomb
Scott Main [Tue, 1 Feb 2011 01:24:07 +0000 (17:24 -0800)]
docs: modify style for toggle stuff so text isn't blue
Change-Id: Ief363bf67d4e0c0fc1a8e79d4b02474c475c88ac
Jean-Baptiste Queru [Mon, 31 Jan 2011 23:19:58 +0000 (15:19 -0800)]
am
e29ef594: (-s ours) Merge from open-source master
* commit '
e29ef594e6836cdeee09de51f3a4b9af11cdabff':
partial build fix
partial build fix
Jean-Baptiste Queru [Mon, 31 Jan 2011 23:14:41 +0000 (15:14 -0800)]
Merge from open-source master
Change-Id: Id74236b5a2b2717bbe45c684573106555c7d9ad2
Brett Chabot [Mon, 31 Jan 2011 21:59:58 +0000 (13:59 -0800)]
am
2aad7a5b: Merge "Add cts-tradefed to cts build." into honeycomb
* commit '
2aad7a5beae2b308332270c27645f45674303a77':
Add cts-tradefed to cts build.
Jean-Baptiste Queru [Mon, 31 Jan 2011 21:50:10 +0000 (13:50 -0800)]
am
2d946f7a: Merge "partial build fix"
* commit '
2d946f7ac9a74870271179d5d7a16a5f9ed61641':
partial build fix
Jean-Baptiste Queru [Mon, 31 Jan 2011 21:50:07 +0000 (13:50 -0800)]
am
de50cfb5: Merge "partial build fix"
* commit '
de50cfb5f961a1ad4ceeeec2108147555fea0e22':
partial build fix
Brett Chabot [Mon, 31 Jan 2011 21:42:11 +0000 (13:42 -0800)]
Merge "Add cts-tradefed to cts build." into honeycomb
Jean-Baptiste Queru [Mon, 31 Jan 2011 21:00:23 +0000 (13:00 -0800)]
Merge "partial build fix"
Jean-Baptiste Queru [Mon, 31 Jan 2011 20:59:54 +0000 (12:59 -0800)]
partial build fix
Change-Id: I831c4c646eca96c6513018fbc5ad88970b942775
Brett Chabot [Sun, 30 Jan 2011 23:07:21 +0000 (15:07 -0800)]
Add cts-tradefed to cts build.
Bug
3403768
Change-Id: I0ca2068f93f25b2f5f6691c5ce70573da4a12aa6
Jean-Baptiste Queru [Mon, 31 Jan 2011 20:36:05 +0000 (12:36 -0800)]
Merge "partial build fix"
Jean-Baptiste Queru [Mon, 31 Jan 2011 20:35:02 +0000 (12:35 -0800)]
partial build fix
Change-Id: I34fe778ac366d702b9eb626feaedda05e69e8361
The Android Open Source Project [Sun, 30 Jan 2011 20:39:46 +0000 (12:39 -0800)]
Reconcile gingerbread-plus-aosp and honeycomb
Change-Id: I3cbceaedf5db731a1eb8340a7644dfe97b98097b
The Android Open Source Project [Sun, 30 Jan 2011 20:39:46 +0000 (12:39 -0800)]
Mass merge from gingerbread - do not merge
Change-Id: Idbfeda9c0a9720d894352747c01754ed2c90c44d
Scott Main [Sat, 29 Jan 2011 18:29:38 +0000 (10:29 -0800)]
am
05d14cb9: (-s ours) 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)
Dianne Hackborn [Sat, 29 Jan 2011 17:27:44 +0000 (09:27 -0800)]
am
50738779: (-s ours) DO NOT MERGE Fix issue #
3373438: Update GBMR versions
* commit '
50738779d90970a3e36fe40a78df724946f323db':
DO NOT MERGE Fix issue #
3373438: Update GBMR versions
Eric Fischer [Sat, 29 Jan 2011 17:27:42 +0000 (09:27 -0800)]
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.
Jean-Baptiste Queru [Sat, 29 Jan 2011 17:27:39 +0000 (09:27 -0800)]
am
a4781e86: Merge from open-source gingerbread
* commit '
a4781e867f2e9115ce5b8085576bebf6505bfd00':
CTS: pass vogar expectation location to CollectAllTests.
Jean-Baptiste Queru [Sat, 29 Jan 2011 17:24:41 +0000 (09:24 -0800)]
Merge
66888a7c from gingerbread
Change-Id: Ieba42e9ecfaf6078d2c8442560119863a329fa06
Ying Wang [Sat, 29 Jan 2011 17:01:14 +0000 (09:01 -0800)]
am
a712543e: Don\'t prepend ./ before the dirs to be removed
* commit '
a712543ec35bd834ad52d47375ab7ec04b8ed3f7':
Don't prepend ./ before the dirs to be removed
Jean-Baptiste Queru [Sat, 29 Jan 2011 16:02:06 +0000 (08:02 -0800)]
am
2039512c: am
61356271: am
e388ac10: Merge "Extra protobuf-related support"
* commit '
2039512c305c8fb21cdce1e338fd36ebeec8ec85':
Extra protobuf-related support
Jean-Baptiste Queru [Sat, 29 Jan 2011 16:01:57 +0000 (08:01 -0800)]
am
d3966412: am
ab81ffe2: am
70b8941f: Merge "Add dnsproxyd to keep in sync with base init.rc"
* commit '
d39664126ed27b816e91312d28b76218f6bd5efb':
Add dnsproxyd to keep in sync with base init.rc
Jean-Baptiste Queru [Sat, 29 Jan 2011 16:01:55 +0000 (08:01 -0800)]
am
53cebd72: (-s ours) am
ad3e0072: am
39f358b7: Merge "Protobuf compiler support in the build system"
* commit '
53cebd72f7bf4fcc430c42f5eb925fec4c77d209':
Protobuf compiler support in the build system
Jean-Baptiste Queru [Fri, 28 Jan 2011 17:25:32 +0000 (09:25 -0800)]
am
5a50ecee: am
f273723f: am
1e0055fb: Merge "A few more grandfathered user tags"
* commit '
5a50ecee40fa2b5e49a8467b35509651f07fb3de':
A few more grandfathered user tags
Jean-Baptiste Queru [Thu, 27 Jan 2011 22:27:32 +0000 (14:27 -0800)]
am
61356271: am
e388ac10: Merge "Extra protobuf-related support"
* commit '
6135627140bd799ee56ba894b69a9455ca0af86a':
Extra protobuf-related support
Jean-Baptiste Queru [Thu, 27 Jan 2011 22:25:30 +0000 (14:25 -0800)]
am
e388ac10: Merge "Extra protobuf-related support"
* commit '
e388ac10b9dfc39f7578b6d222652926265dcffd':
Extra protobuf-related support
Jean-Baptiste Queru [Thu, 27 Jan 2011 22:19:03 +0000 (14:19 -0800)]
Merge "Extra protobuf-related support"
Jean-Baptiste Queru [Thu, 27 Jan 2011 21:57:47 +0000 (13:57 -0800)]
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
Jean-Baptiste Queru [Thu, 27 Jan 2011 21:55:02 +0000 (13:55 -0800)]
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
Jean-Baptiste Queru [Thu, 27 Jan 2011 21:49:30 +0000 (13:49 -0800)]
Extra protobuf-related support
Change-Id: I375d32f0bcb695ccb0603743133034941d584163
Jean-Baptiste Queru [Thu, 27 Jan 2011 21:38:33 +0000 (13:38 -0800)]
Merge "Add dnsproxyd to keep in sync with base init.rc"
Bruce Beare [Thu, 27 Jan 2011 21:16:57 +0000 (13:16 -0800)]
Add dnsproxyd to keep in sync with base init.rc
Change-Id: I8785cb5a5297c3cc6f3b0152fcae578a9ea89e89
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Jean-Baptiste Queru [Thu, 27 Jan 2011 21:32:03 +0000 (13:32 -0800)]
am
ad3e0072: am
39f358b7: Merge "Protobuf compiler support in the build system"
* commit '
ad3e00724d62e5def2f2552533a62a800e9f3ee9':
Protobuf compiler support in the build system
Jean-Baptiste Queru [Thu, 27 Jan 2011 21:30:31 +0000 (13:30 -0800)]
am
39f358b7: Merge "Protobuf compiler support in the build system"
* commit '
39f358b75f1c6a9a10823bf5e400d1ece0144a05':
Protobuf compiler support in the build system
Jean-Baptiste Queru [Thu, 27 Jan 2011 21:22:36 +0000 (13:22 -0800)]
am
f273723f: am
1e0055fb: Merge "A few more grandfathered user tags"
* commit '
f273723f7710bb127ee1026e05049e4ee5290c8a':
A few more grandfathered user tags
Jean-Baptiste Queru [Thu, 27 Jan 2011 21:16:50 +0000 (13:16 -0800)]
am
1e0055fb: Merge "A few more grandfathered user tags"
* commit '
1e0055fb91f7b8582cb2979c45532ae01bf7a779':
A few more grandfathered user tags
Jean-Baptiste Queru [Thu, 27 Jan 2011 21:12:09 +0000 (13:12 -0800)]
Merge "Protobuf compiler support in the build system"
Jean-Baptiste Queru [Thu, 27 Jan 2011 20:19:43 +0000 (12:19 -0800)]
Protobuf compiler support in the build system
Jean-Baptiste Queru [Thu, 27 Jan 2011 20:17:52 +0000 (12:17 -0800)]
Merge "A few more grandfathered user tags"
Jean-Baptiste Queru [Thu, 27 Jan 2011 20:17:00 +0000 (12:17 -0800)]
A few more grandfathered user tags
Change-Id: I57309b461ec2395da068961f976c904bd3474e88
Doug Zongker [Thu, 27 Jan 2011 18:34:36 +0000 (10:34 -0800)]
am
b54972c9: Merge "fix check_target_files_signatures" into honeycomb
* commit '
b54972c90d0f8de8d74f93782c523aa211b1c8d7':
fix check_target_files_signatures
Doug Zongker [Thu, 27 Jan 2011 18:32:16 +0000 (10:32 -0800)]
Merge "fix check_target_files_signatures" into honeycomb
Doug Zongker [Thu, 27 Jan 2011 18:20:27 +0000 (10:20 -0800)]
fix check_target_files_signatures
common.UnzipTemp now returns a 2-tuple instead of just a string.
Bug:
3398407
Change-Id: Ifd0408283aaa15752caa549f4510a0a3db03c3fd
Jean-Baptiste Queru [Thu, 27 Jan 2011 17:26:44 +0000 (09:26 -0800)]
am
020e2fc1: (-s ours) am
928a0304: re-merge from readonly-korg-master - do not merge
* commit '
020e2fc14a28d6fd449fa37cf8bcbd4b0675238a':
re-merge from readonly-korg-master - do not merge
Jean-Baptiste Queru [Thu, 27 Jan 2011 17:24:43 +0000 (09:24 -0800)]
am
928a0304: re-merge from readonly-korg-master - do not merge
* commit '
928a03043187b7c4843b2c832b589c57b7541e4a':
re-merge from readonly-korg-master - do not merge
Jean-Baptiste Queru [Thu, 27 Jan 2011 16:26:25 +0000 (08:26 -0800)]
re-merge from readonly-korg-master - do not merge
Change-Id: Ifc1e39261e1fcaefc1e314d994e71115624643a2
Jean-Baptiste Queru [Thu, 27 Jan 2011 16:58:16 +0000 (08:58 -0800)]
am
46b944dd: (-s ours) am
1fe74722: am
4a91aa9b: (-s ours) Merge "Add a few more legacy modules that can have user tags - do not merge"
* commit '
46b944dd76cfc752a23acd98d00c681fb2c22864':
Add a few more legacy modules that can have user tags - do not merge
Jean-Baptiste Queru [Thu, 27 Jan 2011 16:55:43 +0000 (08:55 -0800)]
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
Jean-Baptiste Queru [Thu, 27 Jan 2011 16:53:44 +0000 (08:53 -0800)]
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
Jean-Baptiste Queru [Thu, 27 Jan 2011 16:26:25 +0000 (08:26 -0800)]
Merge "Add a few more legacy modules that can have user tags - do not merge"
Jean-Baptiste Queru [Thu, 27 Jan 2011 16:18:41 +0000 (08:18 -0800)]
Add a few more legacy modules that can have user tags - do not merge
Change-Id: I198d3eb34958e46ccba145bd05452027cba5e464
Brian Carlstrom [Wed, 26 Jan 2011 23:32:03 +0000 (15:32 -0800)]
am
bb219fc3: Add LOCAL_JARJAR_RULES support for BUILD_HOST_JAVA_LIBRARY
* commit '
bb219fc3dc29e832f3cd8e435c94a894ef2ee87f':
Add LOCAL_JARJAR_RULES support for BUILD_HOST_JAVA_LIBRARY
Brian Carlstrom [Wed, 26 Jan 2011 23:09:47 +0000 (15:09 -0800)]
Add LOCAL_JARJAR_RULES support for BUILD_HOST_JAVA_LIBRARY
Bug:
3086427
Change-Id: Ibe73dfa70d4c3d82968c43e74ced38cd74f60e0f
OSDN Git Service
