OSDN Git Service
The Android Automerger [Mon, 8 Nov 2010 16:24:22 +0000 (08:24 -0800)]
HRH39
Change-Id: I44577431ff79cef28ffbba6c0e0197efe6b22daf
The Android Automerger [Mon, 8 Nov 2010 16:23:43 +0000 (08:23 -0800)]
Merge branch 'master' into honeycomb-release
Scott Main [Sat, 6 Nov 2010 23:25:09 +0000 (16:25 -0700)]
am
9f7e7946: am
c775c754: docs: add gingerbread logo for homepage
* commit '
9f7e7946959fa776731283cbef97646b6d9d3013':
docs: add gingerbread logo for homepage
Scott Main [Sat, 6 Nov 2010 23:24:08 +0000 (16:24 -0700)]
am
56c69603: am
ec97fd30: docs: revisions to ndk download intro
* commit '
56c69603adb97e6f0a81874f16d81f538259cd55':
docs: revisions to ndk download intro
Dirk Dougherty [Sat, 6 Nov 2010 23:18:20 +0000 (16:18 -0700)]
Doc change: Merge commit '
9561b575' into master
Conflicts:
tools/droiddoc/templates-sdk/sdkpage.cs
Change-Id: Ibc2edc2550fe93b3c8f2c7e041fae81136fdb1c2
Scott Main [Sat, 6 Nov 2010 21:21:16 +0000 (14:21 -0700)]
am
c775c754: docs: add gingerbread logo for homepage
* commit '
c775c754f13bd54b7d5da8c28186cdd8167dc53a':
docs: add gingerbread logo for homepage
Wink Saville [Fri, 5 Nov 2010 22:38:37 +0000 (15:38 -0700)]
Merge "Rename protoc to aprotoc."
android-build SharedAccount [Fri, 5 Nov 2010 22:06:14 +0000 (15:06 -0700)]
HRH35C
Change-Id: I9ad977ba8626ad0d2f72fd1d8d8552f8c788cd37
Scott Main [Fri, 5 Nov 2010 21:29:07 +0000 (14:29 -0700)]
docs: add gingerbread logo for homepage
Change-Id: I54db7009931e1ec5688d4f473a520a4f61db598a
Scott Main [Fri, 5 Nov 2010 20:57:15 +0000 (13:57 -0700)]
am
ec97fd30: docs: revisions to ndk download intro
* commit '
ec97fd30a6af6d954f156620a69c29352e012d39':
docs: revisions to ndk download intro
Robert Ly [Fri, 5 Nov 2010 20:57:10 +0000 (13:57 -0700)]
am
706e41e5: Update the template text for the NDK download page to point to new links
* commit '
706e41e55f2e3b456c51b56ba07d1dfd56716af9':
Update the template text for the NDK download page to point to new links
Ying Wang [Fri, 5 Nov 2010 18:30:58 +0000 (11:30 -0700)]
Allow module-specific protoc flags.
You can add local protoc flags via LOCAL_PROTOC_FLAGS.
Change-Id: If246a4edafe1edcec6a7f193bde8ce3c83de745b
Wink Saville [Fri, 5 Nov 2010 18:28:51 +0000 (11:28 -0700)]
Rename protoc to aprotoc.
With gLucid protoc is installed in the base system, by renaming
our version there will be no confusion about which compiler is
being used.
Change-Id: Id6900baacc7d57abee5dc5f694b013d7a42b35c6
Ying Wang [Fri, 5 Nov 2010 18:20:03 +0000 (11:20 -0700)]
Set the correct proto intermediate dir for native modules.
Change-Id: I008778de2b81ed0c029979a7865827a96bf44b51
Ying Wang [Fri, 5 Nov 2010 17:33:41 +0000 (17:33 +0000)]
Merge "Integrate protocol buffer compiler into the build system."
Scott Main [Fri, 5 Nov 2010 04:02:14 +0000 (21:02 -0700)]
docs: revisions to ndk download intro
Change-Id: Ib1ba3d5f0e727a1246dc92161b72bcfff6f9d772
android-build SharedAccount [Thu, 4 Nov 2010 23:41:51 +0000 (16:41 -0700)]
HRH35B
Change-Id: Ibc8cac9177579121d74d1bc02afe826780cfac37
Robert Ly [Wed, 3 Nov 2010 01:35:43 +0000 (18:35 -0700)]
Update the template text for the NDK download page to point to new
links
Change-Id: Icb1571eae18dcd9f9f86c5fd855f15783f9d4ae4
Ying Wang [Thu, 4 Nov 2010 20:21:20 +0000 (13:21 -0700)]
Merge "'make dump-products' to dump products."
Jean-Baptiste Queru [Thu, 4 Nov 2010 17:57:36 +0000 (10:57 -0700)]
am
57723b52: Merge
7b393fd1 from open-source master
* commit '
57723b52cdb446c751ba8e65fa060e7a4faf4907':
Add version_defaults.mk to be a prerequisite of build.prop
The Android Automerger [Thu, 4 Nov 2010 16:34:04 +0000 (09:34 -0700)]
HRH35
Change-Id: Ie2a5b8d1fc7eb176b8e1878391434515e36eb134
The Android Automerger [Thu, 4 Nov 2010 16:33:08 +0000 (09:33 -0700)]
Merge branch 'master' into honeycomb-release
Jean-Baptiste Queru [Thu, 4 Nov 2010 14:24:48 +0000 (07:24 -0700)]
Merge
7b393fd1 from open-source master
Change-Id: I5fee3ccbf7845d087e72848b4cec0198cd4afc26
android-build SharedAccount [Wed, 3 Nov 2010 23:07:24 +0000 (16:07 -0700)]
HRH34B: 73911 on master + cherry pick of
acdeeee57f829d6b33fc71df166048c70faa0168
Change-Id: I21cbb1b5178b2263080bc71c92356c6851fa4dff
The Android Automerger [Wed, 3 Nov 2010 23:00:42 +0000 (16:00 -0700)]
HRH34
Change-Id: Ib14874624edc09898c0c7815d2b1462de1276984
The Android Automerger [Wed, 3 Nov 2010 22:34:27 +0000 (15:34 -0700)]
Merge branch 'master' into honeycomb-release
Jean-Baptiste Queru [Wed, 3 Nov 2010 17:59:25 +0000 (10:59 -0700)]
am
6be29424: am
892ea1ea: Merge "build: Add spare size flag to mkyaffs2image"
* commit '
6be29424c60cb5e17ce0aacb026c1cb88a62428b':
build: Add spare size flag to mkyaffs2image
Jean-Baptiste Queru [Wed, 3 Nov 2010 17:29:55 +0000 (10:29 -0700)]
Merge "Add version_defaults.mk to be a prerequisite of build.prop"
Chih-Wei Huang [Wed, 3 Nov 2010 10:33:46 +0000 (18:33 +0800)]
Add version_defaults.mk to be a prerequisite of build.prop
The version_defaults.mk defines variables that may affect
the content of build.prop.
Change-Id: Iabb82459949bb6e7a91829c5b485aad331c50b72
Ying Wang [Wed, 3 Nov 2010 06:04:24 +0000 (23:04 -0700)]
'make dump-products' to dump products.
Change-Id: I6a1e7ce5d54f47898199bfc9d29245c2598f733c
Ying Wang [Wed, 3 Nov 2010 04:31:47 +0000 (21:31 -0700)]
Only copy once even if the first matched src:dest pair appears more than once.
Change-Id: I9bef6172a1123518e97e04190fb857f9ee2c7582
Ying Wang [Wed, 3 Nov 2010 01:43:16 +0000 (18:43 -0700)]
Integrate protocol buffer compiler into the build system.
Bug:
3152546
Change-Id: Ida3ca3d633ce45704dc8e80d044cdbd3ca69aca5
Xavier Ducrohet [Tue, 2 Nov 2010 22:34:06 +0000 (15:34 -0700)]
Temporarily remove some apps from the SDK build.
Change-Id: Ic23449ee144f0bf4ba4a208e8742a7db31d1b8a4
android-build SharedAccount [Wed, 3 Nov 2010 01:03:41 +0000 (18:03 -0700)]
HRH33C
Change-Id: Ia2f777aa815372efb33bc78d1ec11a6f860b500e
android-build SharedAccount [Tue, 2 Nov 2010 23:14:18 +0000 (16:14 -0700)]
HRH33B
Change-Id: I6138596d2a5066f9dbcaa6ab3c10ab85a933d45c
Jean-Baptiste Queru [Tue, 2 Nov 2010 21:17:54 +0000 (14:17 -0700)]
am
892ea1ea: Merge "build: Add spare size flag to mkyaffs2image"
* commit '
892ea1eaadfa5b57948bb66bd3432e06c58188e1':
build: Add spare size flag to mkyaffs2image
Xavier Ducrohet [Tue, 2 Nov 2010 20:59:40 +0000 (13:59 -0700)]
Add the fonts to the SDK system image.
Change-Id: I905e42b8ca44901adc15b083689c2252a18ce130
Raphael Moll [Tue, 2 Nov 2010 18:42:33 +0000 (11:42 -0700)]
Merge "Cygwin fix: Use new #if HAVE_STAT_ST_MTIM"
Jean-Baptiste Queru [Tue, 2 Nov 2010 16:01:30 +0000 (09:01 -0700)]
Merge "build: Add spare size flag to mkyaffs2image"
Naseer Ahmed [Fri, 6 Aug 2010 19:19:29 +0000 (12:19 -0700)]
build: Add spare size flag to mkyaffs2image
Change-Id: Ib3a915ba5296d31f88cdc81e13da02f281dbdb9f
The Android Automerger [Tue, 2 Nov 2010 15:24:38 +0000 (08:24 -0700)]
HRH33
Change-Id: Ic8ec9d10fd1bd1ec6a0160b675c623868983c3cc
The Android Automerger [Tue, 2 Nov 2010 15:24:15 +0000 (08:24 -0700)]
Merge branch 'master' into honeycomb-release
Scott Main [Tue, 2 Nov 2010 03:23:06 +0000 (20:23 -0700)]
am
987fb055: (-s ours) am
2e94aa25: docs: make the resizable side nav standard. DO NOT MERGE. This actually affects only the SDK tab, which previously did not allow resizing---now it does. Also add a couple new templates to allow either 190 or 200 pixel-wide side navigation by
* commit '
987fb055d12667e4cacad2f9a26e7bb92cce10c2':
docs: make the resizable side nav standard. DO NOT MERGE. This actually affects only the SDK tab, which previously did not allow resizing---now it does. Also add a couple new templates to allow either 190 or 200 pixel-wide side navigation by default, and apply 200 to the Resources tab.
Scott Main [Tue, 2 Nov 2010 03:21:39 +0000 (20:21 -0700)]
am
2e94aa25: docs: make the resizable side nav standard. DO NOT MERGE. This actually affects only the SDK tab, which previously did not allow resizing---now it does. Also add a couple new templates to allow either 190 or 200 pixel-wide side navigation by default, and
* commit '
2e94aa25d458e96d6503b88c52e81c65fb34a9d0':
docs: make the resizable side nav standard. DO NOT MERGE. This actually affects only the SDK tab, which previously did not allow resizing---now it does. Also add a couple new templates to allow either 190 or 200 pixel-wide side navigation by default, and apply 200 to the Resources tab.
Raphael Moll [Wed, 13 Oct 2010 23:50:05 +0000 (16:50 -0700)]
Cygwin fix: Use new #if HAVE_STAT_ST_MTIM
stat.st_mtim doesn't exist under MinGW or Cygwin.
Change-Id: I0d9c81a0529d8d289d84600ed9d1a451e7f1f258
Scott Main [Mon, 1 Nov 2010 22:51:49 +0000 (15:51 -0700)]
docs: make the resizable side nav standard. DO NOT MERGE.
This actually affects only
the SDK tab, which previously did not allow resizing---now it does.
Also add a couple new templates to allow either 190 or 200 pixel-wide
side navigation by default, and apply 200 to the Resources tab.
Change-Id: I4555c496088dd8aac77f9aa01273c3a1d52f89e0
Scott Main [Mon, 1 Nov 2010 17:55:43 +0000 (10:55 -0700)]
am
e9e311a4: (-s ours) am
fa83b5e4: Merge "docs: update sdk download template DO NOT MERGE add windows installer and revise a bit else" into gingerbread
* commit '
e9e311a47b9a02b411e1b457d5e72ac0321a7015':
docs: update sdk download template DO NOT MERGE add windows installer and revise a bit else
Scott Main [Mon, 1 Nov 2010 17:53:08 +0000 (10:53 -0700)]
am
fa83b5e4: Merge "docs: update sdk download template DO NOT MERGE add windows installer and revise a bit else" into gingerbread
* commit '
fa83b5e4daf43a431463e80c56fe115a6db3ca04':
docs: update sdk download template DO NOT MERGE add windows installer and revise a bit else
Scott Main [Mon, 1 Nov 2010 17:49:07 +0000 (10:49 -0700)]
Merge "docs: update sdk download template DO NOT MERGE add windows installer and revise a bit else" into gingerbread
The Android Automerger [Mon, 1 Nov 2010 14:46:48 +0000 (07:46 -0700)]
HRH32
Change-Id: Id64709211f26b9e6128013b5689ee13f71e23062
The Android Automerger [Mon, 1 Nov 2010 14:46:01 +0000 (07:46 -0700)]
Merge branch 'master' into honeycomb-release
Raphael Moll [Sat, 30 Oct 2010 02:05:40 +0000 (19:05 -0700)]
am
3a632f7d: (-s ours) am
4aa7a190: Merge "Fix "make acp" under Cygwin. DO NOT MERGE."
* commit '
3a632f7d3760fbf34dd03f37642562e31abfd468':
Fix "make acp" under Cygwin. DO NOT MERGE.
Raphael Moll [Sat, 30 Oct 2010 02:03:49 +0000 (19:03 -0700)]
am
4aa7a190: Merge "Fix "make acp" under Cygwin. DO NOT MERGE."
* commit '
4aa7a190bb81b7e3ad12d53b83908c3c72745f6e':
Fix "make acp" under Cygwin. DO NOT MERGE.
Raphael Moll [Sat, 30 Oct 2010 01:53:07 +0000 (18:53 -0700)]
Merge "Fix "make acp" under Cygwin. DO NOT MERGE."
android-build SharedAccount [Fri, 29 Oct 2010 20:28:40 +0000 (13:28 -0700)]
HRH29B
Change-Id: I68b10a877d258f9e6b2aa5a3eb2b61529f4c8d2d
Jean-Baptiste Queru [Fri, 29 Oct 2010 15:20:09 +0000 (08:20 -0700)]
am
b3a45fea: (-s ours) am
6a514dcc: am
16bf5290: (-s ours) Merge from AOSP froyo. Do not merge.
* commit '
b3a45feaf9f09dd60b94ef88bbc52ff7a75f39d2':
CTS vm-tests now depend on hosttestlib.
Jean-Baptiste Queru [Fri, 29 Oct 2010 15:16:49 +0000 (08:16 -0700)]
am
6a514dcc: am
16bf5290: (-s ours) Merge from AOSP froyo. Do not merge.
* commit '
6a514dcc9d7d851d5cbe95ef7603d2bf0523a6a2':
CTS vm-tests now depend on hosttestlib.
The Android Automerger [Fri, 29 Oct 2010 14:32:54 +0000 (07:32 -0700)]
HRH29
Change-Id: Iaaf601b79833da091143632d89311cb139fdf7a8
The Android Automerger [Fri, 29 Oct 2010 14:32:26 +0000 (07:32 -0700)]
Merge branch 'master' into honeycomb-release
Jean-Baptiste Queru [Fri, 29 Oct 2010 12:51:54 +0000 (05:51 -0700)]
am
16bf5290: (-s ours) Merge from AOSP froyo. Do not merge.
* commit '
16bf5290b1c8fcedda6c376db64f2bacbaf2c7a4':
CTS vm-tests now depend on hosttestlib.
Jean-Baptiste Queru [Fri, 29 Oct 2010 12:45:56 +0000 (05:45 -0700)]
Merge from AOSP froyo. Do not merge.
CTS vm-tests now depend on hosttestlib.
Change-Id: Ie252227825ccb843b4be1205e3b135b7535b8a03
Daniel Sandler [Thu, 28 Oct 2010 19:43:56 +0000 (12:43 -0700)]
Merge "make help: prints a handy list of useful targets"
Daniel Sandler [Thu, 28 Oct 2010 19:31:47 +0000 (15:31 -0400)]
make help: prints a handy list of useful targets
A small step to making the platform build environment more
self-documenting.
Change-Id: I8f6cebe6cbd4cf89736da23e9d0d2a257ea422ee
The Android Automerger [Thu, 28 Oct 2010 14:12:26 +0000 (07:12 -0700)]
HRH28
Change-Id: I06b7e2456d3cfbcd4080ad30c13d047396a8abb4
The Android Automerger [Thu, 28 Oct 2010 14:11:33 +0000 (07:11 -0700)]
Merge branch 'master' into honeycomb-release
Scott Main [Thu, 28 Oct 2010 05:35:24 +0000 (22:35 -0700)]
docs: update sdk download template DO NOT MERGE
add windows installer and revise a bit else
Change-Id: Ie0ea7765d797cb54ee1d7fc733ec6db4fdedac3a
Raphael Moll [Thu, 28 Oct 2010 02:06:12 +0000 (19:06 -0700)]
Fix "make acp" under Cygwin. DO NOT MERGE.
Change-Id: I52ae8d4835b27a712d4795e7f41fa9ca4f3a822d
Brett Chabot [Thu, 28 Oct 2010 01:58:46 +0000 (18:58 -0700)]
am
6e644e14: am
ebf4b519: cherry pick \'CTS vm-tests depend on hostestlib\' into GB.
Brett Chabot [Thu, 28 Oct 2010 01:56:53 +0000 (18:56 -0700)]
am
ebf4b519: cherry pick \'CTS vm-tests depend on hostestlib\' into GB.
Brett Chabot [Thu, 28 Oct 2010 01:49:33 +0000 (18:49 -0700)]
cherry pick 'CTS vm-tests depend on hostestlib' into GB.
Original description:
CTS vm-tests now depend on hosttestlib.
Bug
3125713
Conflicts:
core/tasks/cts.mk
Change-Id: I9e364a9d9d2cae396691921424ca591beca05468
android-build SharedAccount [Thu, 28 Oct 2010 00:38:34 +0000 (17:38 -0700)]
HRH27B
Change-Id: If7ad5e504edf7d6df0531179b653f1dd6a9b4710
Jean-Baptiste Queru [Wed, 27 Oct 2010 21:59:39 +0000 (14:59 -0700)]
Merge "CTS vm-tests now depend on hosttestlib." into froyo
The Android Automerger [Wed, 27 Oct 2010 14:16:14 +0000 (07:16 -0700)]
HRH27
Change-Id: Ia67d7d14520d16f0f067dc7851b63a67e372c4d3
Brett Chabot [Wed, 27 Oct 2010 01:55:56 +0000 (18:55 -0700)]
CTS vm-tests now depend on hosttestlib.
Bug
3125713
Change-Id: I5774df2abeff7dd82e1218138d1ea3b25edd0901
The Android Automerger [Tue, 26 Oct 2010 14:08:34 +0000 (07:08 -0700)]
HRH26
Change-Id: Ic14f39e6c35852a418197764c52fe48a5125a094
The Android Automerger [Tue, 26 Oct 2010 14:07:53 +0000 (07:07 -0700)]
Merge branch 'master' into honeycomb-release
android-build SharedAccount [Tue, 26 Oct 2010 01:07:41 +0000 (18:07 -0700)]
HRH25B
Change-Id: I7b6b18167b13a56dca170ac54c16d66372516517
Scott Main [Tue, 26 Oct 2010 00:31:29 +0000 (17:31 -0700)]
am
6084cc94: (-s ours) am
9d32bd5b: docs: css tweak to Ps in sidebox. DO NOT MERGE.
Merge commit '
6084cc948c58032f509adfdcdcd367ae6a67e5ac'
* commit '
6084cc948c58032f509adfdcdcd367ae6a67e5ac':
docs: css tweak to Ps in sidebox. DO NOT MERGE.
Scott Main [Tue, 26 Oct 2010 00:22:50 +0000 (17:22 -0700)]
am
9d32bd5b: docs: css tweak to Ps in sidebox. DO NOT MERGE.
Merge commit '
9d32bd5b03c92e9220ff6cca029a587f5f3c754c' into gingerbread-plus-aosp
* commit '
9d32bd5b03c92e9220ff6cca029a587f5f3c754c':
docs: css tweak to Ps in sidebox. DO NOT MERGE.
Scott Main [Tue, 26 Oct 2010 00:14:24 +0000 (17:14 -0700)]
docs: css tweak to Ps in sidebox. DO NOT MERGE.
Change-Id: Ifa3e4a9a2c2ba67b6da615ebc336c897dd9caeda
The Android Automerger [Mon, 25 Oct 2010 14:14:21 +0000 (07:14 -0700)]
HRH25
Change-Id: Ib836ff4018563d931b26435a8ffc873faf832ccb
The Android Automerger [Mon, 25 Oct 2010 14:13:28 +0000 (07:13 -0700)]
Merge branch 'master' into honeycomb-release
android-build SharedAccount [Sun, 24 Oct 2010 22:31:00 +0000 (15:31 -0700)]
HRH21D
Change-Id: I6d2351fd6ac73acbaff6fb2cbba46f35f3c7761d
Jean-Baptiste Queru [Sun, 24 Oct 2010 21:02:10 +0000 (14:02 -0700)]
resolved conflicts for merge of
cbc479c3 to master
Change-Id: Ie421c405d2a52f6c7f1d65f44e0576e32842a559
Jean-Baptiste Queru [Sun, 24 Oct 2010 20:31:17 +0000 (13:31 -0700)]
Set defauilt ringtone and default notification in full builds
Change-Id: Ia5c76d393d428dffc72cb8440720fa0f0884e401
Jean-Baptiste Queru [Sun, 24 Oct 2010 13:08:24 +0000 (06:08 -0700)]
resolved conflicts for merge of
cd3bd740 to master
Change-Id: I07aaf337e325b1cec652497f2630b5c42096f9a5
Jean-Baptiste Queru [Sun, 24 Oct 2010 11:53:58 +0000 (04:53 -0700)]
Merge "Delete obsolete full_no_telephony.mk"
Shih-wei Liao [Sat, 23 Oct 2010 10:07:13 +0000 (03:07 -0700)]
Turn off llvm-rs-link to make launch time go faster.
Change-Id: Idbbb5e24a269e3c9a1911b47b4fbb1616cef5803
Jean-Baptiste Queru [Sat, 23 Oct 2010 01:56:30 +0000 (18:56 -0700)]
Use the new list of all audio files
Change-Id: Ic510c243dde616cca3374f6aa6a2835690cf6818
Jean-Baptiste Queru [Sat, 23 Oct 2010 01:03:47 +0000 (18:03 -0700)]
am
68f21cdc: (-s ours) Minor cleanup - DO NOT MERGE
Merge commit '
68f21cdc71b9ad7362e4f7c22d44a601c9e58f07'
* commit '
68f21cdc71b9ad7362e4f7c22d44a601c9e58f07':
Minor cleanup - DO NOT MERGE
Jean-Baptiste Queru [Fri, 22 Oct 2010 23:37:08 +0000 (16:37 -0700)]
Delete obsolete full_no_telephony.mk
Change-Id: I944209ce5dc70cd1f43a9204faff38bc367d923f
Jean-Baptiste Queru [Fri, 22 Oct 2010 23:28:33 +0000 (16:28 -0700)]
Improve setup of base products.
Split telephony into its own product, so that we can easily
add telephony support to any configuration without pulling
anything else. Use it from generic.
Split the "full" family between a (no-telephony) base,
a telephony version of the same (both of which can be used
as a starting point for on-device builds), and the true classic
full which is an emulator build.
Change-Id: I616d34f2a29415b8ec997173f8e893c312ade5c2
Jean-Baptiste Queru [Fri, 22 Oct 2010 23:13:02 +0000 (16:13 -0700)]
Minor cleanup - DO NOT MERGE
Change-Id: I0fc4e3c45ae5a545f1a02ed974bc3c7500286e22
android-build SharedAccount [Fri, 22 Oct 2010 23:04:38 +0000 (16:04 -0700)]
HRH21C
Change-Id: Ib64113b82311a9d19d03a85d5ef857aa84dae683
Jean-Baptiste Queru [Fri, 22 Oct 2010 22:10:18 +0000 (15:10 -0700)]
am
dd46ad41: (-s ours) Clean up full config - DO NOT MERGE
Jean-Baptiste Queru [Fri, 22 Oct 2010 21:41:55 +0000 (14:41 -0700)]
Clean up full config - DO NOT MERGE
This splits the existing full.mk in two parts:
-One is the device-independent full_base.mk
-The other is the emulator-specific device.mk
This way we'll be able to inherit from full_base.mk
for on-device builds without any emulator-specific
files getting in the way.
Change-Id: Ieb1f4ed47988c8fff119ff53f1f374032da3752d
Ying Wang [Fri, 22 Oct 2010 21:41:17 +0000 (14:41 -0700)]
resolved conflicts for merge of
e67944ee to master
Change-Id: I9284d5a5df6fc963bc4c70c87a505857f41c93af
Ying Wang [Fri, 22 Oct 2010 21:14:59 +0000 (14:14 -0700)]
Switch Unbundled apps from generic.mk to full.mk.
Change-Id: I7aaaef8f2032590d55ccec77621c6b3f4c121f9a
Jean-Baptiste Queru [Fri, 22 Oct 2010 20:02:38 +0000 (13:02 -0700)]
am
040e8cf0: Fix list of locales (bad country codes).
Jean-Baptiste Queru [Fri, 22 Oct 2010 19:34:32 +0000 (12:34 -0700)]
Fix list of locales (bad country codes).
DA->DK, SV->SE
Change-Id: I7bc7f64905ecd583e1a7ca5b43a8fffd5f3ba383
OSDN Git Service
