OSDN Git Service
The Android Open Source Project [Fri, 5 Aug 2011 01:45:50 +0000 (18:45 -0700)]
Reconcile with gingerbread-release gingerbread-mr4-release honeycomb-LTE-release
Change-Id: I7fac76d938aaa591a908b7a5b7cc5b5d31b79efe
The Android Automerger [Thu, 4 Aug 2011 14:03:40 +0000 (07:03 -0700)]
HLK35
The Android Automerger [Thu, 4 Aug 2011 14:03:17 +0000 (07:03 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
Jean-Baptiste Queru [Thu, 4 Aug 2011 00:42:16 +0000 (17:42 -0700)]
am
c55ebf23: am
8dd289d3: Ignore from gingerbread
* commit '
c55ebf232e1c0287ef841a5d917cb12feefba2d6':
Updating version to 2.3.7 to reflect some patches.
Bumping version to 2.3.6 to reflect a few patches.
The Android Automerger [Wed, 3 Aug 2011 14:03:26 +0000 (07:03 -0700)]
HLK34
The Android Automerger [Wed, 3 Aug 2011 14:03:07 +0000 (07:03 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
Jean-Baptiste Queru [Wed, 3 Aug 2011 00:09:58 +0000 (17:09 -0700)]
am
8dd289d3: Ignore from gingerbread
* commit '
8dd289d399e76f90e24383a7ffed4b667db6cbb3':
Updating version to 2.3.7 to reflect some patches.
Bumping version to 2.3.6 to reflect a few patches.
Jean-Baptiste Queru [Wed, 3 Aug 2011 00:04:41 +0000 (17:04 -0700)]
Ignore from gingerbread
We like our AOSP version numbers unchanged and a bit nutty.
Change-Id: Iddfd494bc52f13bdeb90f39393d89f554e2cfb64
The Android Automerger [Tue, 2 Aug 2011 23:56:15 +0000 (16:56 -0700)]
GWK15F
Change-Id: If34f003efe36006666e68ab39313772257ea1b45
Dan Morrill [Tue, 2 Aug 2011 23:46:38 +0000 (16:46 -0700)]
Updating version to 2.3.7 to reflect some patches.
Change-Id: I6118b41a26a1ea6940758313871eb8ab83ab06a2
The Android Automerger [Tue, 2 Aug 2011 23:52:03 +0000 (16:52 -0700)]
Merge remote branch 'goog/gingerbread-release' into gingerbread-mr4-release
Conflicts:
core/build_id.mk
Change-Id: If3af1b8a02be0eff4373ff62469ccee820ffeb6a
Dan Morrill [Tue, 2 Aug 2011 23:46:38 +0000 (16:46 -0700)]
Updating version to 2.3.7 to reflect some patches.
Change-Id: I6118b41a26a1ea6940758313871eb8ab83ab06a2
The Android Automerger [Tue, 2 Aug 2011 23:24:03 +0000 (16:24 -0700)]
HLK33C
The Android Automerger [Tue, 2 Aug 2011 23:23:31 +0000 (16:23 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
Dan Morrill [Tue, 2 Aug 2011 22:36:05 +0000 (15:36 -0700)]
Bumping version to 2.3.6 to reflect a few patches.
Change-Id: I540a3954c70502e3deac151c642d454c87a3821b
android-merger [Tue, 2 Aug 2011 23:07:09 +0000 (16:07 -0700)]
GRJ90B
Change-Id: I8da7004b84d8f3df0fee126b178d8bcbcb7b6eb1
Dan Morrill [Tue, 2 Aug 2011 22:36:05 +0000 (15:36 -0700)]
Bumping version to 2.3.6 to reflect a few patches.
Change-Id: I540a3954c70502e3deac151c642d454c87a3821b
The Android Open Source Project [Tue, 2 Aug 2011 16:52:34 +0000 (09:52 -0700)]
Reconcile with honeycomb-LTE-release
Change-Id: I98bfcba4046382292383ce333ab521b1ab583ce1
The Android Automerger [Tue, 2 Aug 2011 16:37:27 +0000 (09:37 -0700)]
HLK33B
The Android Automerger [Tue, 2 Aug 2011 16:37:18 +0000 (09:37 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Open Source Project [Tue, 2 Aug 2011 14:33:41 +0000 (07:33 -0700)]
Reconcile with honeycomb-LTE-release
Change-Id: I0665c9e635f6260b3de3590f553c163d6732bb01
The Android Automerger [Tue, 2 Aug 2011 14:07:14 +0000 (07:07 -0700)]
HLK33
The Android Automerger [Tue, 2 Aug 2011 14:06:50 +0000 (07:06 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Open Source Project [Mon, 1 Aug 2011 14:22:35 +0000 (07:22 -0700)]
Reconcile with honeycomb-LTE-release
Change-Id: I1d877334c673a600d5f31abe8c2764635dcd98f2
The Android Automerger [Mon, 1 Aug 2011 14:05:55 +0000 (07:05 -0700)]
HLK32
The Android Automerger [Mon, 1 Aug 2011 14:05:41 +0000 (07:05 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Open Source Project [Sat, 30 Jul 2011 20:12:16 +0000 (13:12 -0700)]
Reconcile with honeycomb-LTE-release
Change-Id: I2e9258d81a5a89d8d07af36c70c3bb2463bde3b4
The Android Automerger [Fri, 29 Jul 2011 23:54:19 +0000 (16:54 -0700)]
HLK28C
Change-Id: I95a479237f5e1f98fab050321e18acec2fd9e495
Ying Wang [Fri, 29 Jul 2011 20:32:11 +0000 (13:32 -0700)]
Add iptables and ip6tables to core.mk.
Change-Id: I1cb2be8a28013b20d1032a8d766021a2f4aca9e1
The Android Automerger [Fri, 29 Jul 2011 23:39:57 +0000 (16:39 -0700)]
HLK28B
Change-Id: Icaf880edd34a856aea8578f44de09de710ca29af
The Android Automerger [Fri, 29 Jul 2011 23:36:54 +0000 (16:36 -0700)]
HLK29B
Change-Id: I7bb412b23b8bcd4850b1c4a9db8b8e3943d100a9
The Android Automerger [Fri, 29 Jul 2011 23:36:50 +0000 (16:36 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Open Source Project [Fri, 29 Jul 2011 23:19:42 +0000 (16:19 -0700)]
Reconcile with gingerbread-mr4-release honeycomb-LTE-release
Change-Id: Ia001a7364a761781ce15e61db6988a1961cb2bff
Scott Main [Fri, 29 Jul 2011 22:10:03 +0000 (15:10 -0700)]
Merge "docs: update api filtering to support provisional APIs (api levels that are string names)"
Raphael Moll [Fri, 29 Jul 2011 21:34:01 +0000 (14:34 -0700)]
am
dd9e8477: am
266a571f: am
dceb4655: Merge "Add sdk/assetstudio to the Windows build paths."
* commit '
dd9e8477e6cc1a8de556dd7942fb81c049e2e373':
Add sdk/assetstudio to the Windows build paths.
Ying Wang [Fri, 29 Jul 2011 21:25:59 +0000 (14:25 -0700)]
resolved conflicts for merge of
9b5447df to master
Change-Id: I1fe490a9e0bf01321c845ab0150fead06c16d68b
Raphael Moll [Fri, 29 Jul 2011 20:59:23 +0000 (13:59 -0700)]
am
266a571f: am
dceb4655: Merge "Add sdk/assetstudio to the Windows build paths."
* commit '
266a571fbd557c402e937130922ced8c523dd451':
Add sdk/assetstudio to the Windows build paths.
Ying Wang [Fri, 29 Jul 2011 20:58:43 +0000 (13:58 -0700)]
am
24cad7d4: Add iptables and ip6tables to core.mk.
* commit '
24cad7d4f7962d3413d520791cb2b8a5a5266f58':
Add iptables and ip6tables to core.mk.
Raphael Moll [Fri, 29 Jul 2011 20:56:51 +0000 (13:56 -0700)]
am
dceb4655: Merge "Add sdk/assetstudio to the Windows build paths."
* commit '
dceb46559eb8077553d1bd4d738fb4b325af9396':
Add sdk/assetstudio to the Windows build paths.
Raphael Moll [Fri, 29 Jul 2011 20:50:50 +0000 (13:50 -0700)]
Merge "Add sdk/assetstudio to the Windows build paths."
Ying Wang [Fri, 29 Jul 2011 20:32:11 +0000 (13:32 -0700)]
Add iptables and ip6tables to core.mk.
Change-Id: I1cb2be8a28013b20d1032a8d766021a2f4aca9e1
The Android Automerger [Fri, 29 Jul 2011 20:46:55 +0000 (13:46 -0700)]
GWK15E
Change-Id: I60b7f8f0883594ed648ee1d97c0ac221645fa7a0
Raphael Moll [Fri, 29 Jul 2011 20:04:20 +0000 (13:04 -0700)]
Add sdk/assetstudio to the Windows build paths.
Change-Id: Ide8d418aa25cf39852a25e08fd2a27c7882586e7
The Android Automerger [Fri, 29 Jul 2011 14:20:23 +0000 (07:20 -0700)]
HLK29
Change-Id: Iff165f81fde7af292c4763cc24c95dbc796548ab
The Android Automerger [Fri, 29 Jul 2011 14:20:16 +0000 (07:20 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Thu, 28 Jul 2011 14:25:07 +0000 (07:25 -0700)]
HLK28
Change-Id: I433b7584e4facbfa28699bb489d3afc6c6a28251
The Android Automerger [Thu, 28 Jul 2011 14:25:00 +0000 (07:25 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
Scott Main [Thu, 28 Jul 2011 01:20:34 +0000 (18:20 -0700)]
docs: update api filtering to support provisional APIs (api levels that are string names)
Change-Id: I2df890739054e4130e455c9dcf5540a9c39f5ee3
Scott Main [Wed, 13 Jul 2011 00:07:30 +0000 (17:07 -0700)]
cherrypick Change-Id: I8b29d54ba9e6f712907b01ad6f4669e6bb30007a
docs: update android market icon
Change-Id: Ibea9ae92e17d2f810daa8922a15f2defc9e2fb3c
The Android Open Source Project [Wed, 27 Jul 2011 17:42:28 +0000 (10:42 -0700)]
Reconcile with gingerbread-mr4-release honeycomb-LTE-release
Change-Id: I16fbf08ea855a5ec9a064253861f814a5acb6b21
The Android Automerger [Wed, 27 Jul 2011 14:20:03 +0000 (07:20 -0700)]
HLK27
Change-Id: I56c92e1d76325f9e2d445ef732028f30cb421931
The Android Automerger [Wed, 27 Jul 2011 14:19:59 +0000 (07:19 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Tue, 26 Jul 2011 14:21:44 +0000 (07:21 -0700)]
HLK26
Change-Id: I369306a7ce84013f36bfddb6b234aa5cdbe8c6b2
The Android Automerger [Tue, 26 Jul 2011 14:21:39 +0000 (07:21 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
Eric Laurent [Sun, 24 Jul 2011 17:09:26 +0000 (10:09 -0700)]
Added power manager service library.
Added library with native binder interface to PowerManagerService.
Change-Id: Ic99efce5058b8c1a81ff277dfaa42f192441080c
The Android Automerger [Mon, 25 Jul 2011 22:56:36 +0000 (15:56 -0700)]
GWK15D
Change-Id: I5db71a9c7d02a03682600ac958b8fcb8d3ae2a57
The Android Automerger [Mon, 25 Jul 2011 18:33:40 +0000 (11:33 -0700)]
GWK15C
Change-Id: I8484258e2dafc03f84c2e8b512f87e4c1ad8f3fe
The Android Open Source Project [Mon, 25 Jul 2011 14:39:08 +0000 (07:39 -0700)]
Reconcile with honeycomb-LTE-release
Change-Id: I3ce89e9dd1e8e5af604c6011372d03871788d68d
The Android Automerger [Mon, 25 Jul 2011 14:20:28 +0000 (07:20 -0700)]
HLK25
Change-Id: I9e5a0007de7806b0d49554f3a67f72d84adae42a
The Android Automerger [Mon, 25 Jul 2011 14:20:21 +0000 (07:20 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Open Source Project [Fri, 22 Jul 2011 22:00:44 +0000 (15:00 -0700)]
Reconcile with honeycomb-LTE-release
Change-Id: Iaceaa1453e9e31e92fd90ff413422792aef940bb
The Android Automerger [Fri, 22 Jul 2011 21:22:00 +0000 (14:22 -0700)]
HLK22B
Change-Id: I70e7afdd9950937d1229ec54e14aed34e31d36a4
The Android Automerger [Fri, 22 Jul 2011 21:21:56 +0000 (14:21 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Open Source Project [Fri, 22 Jul 2011 17:05:55 +0000 (10:05 -0700)]
Reconcile with honeycomb-LTE-release
Change-Id: I5bac70e5d4432c54ced5a85f629eb819f1d70f2e
Dmitry Shmidt [Fri, 22 Jul 2011 17:01:32 +0000 (10:01 -0700)]
Merge "Add hostapd utility"
Dmitry Shmidt [Fri, 22 Jul 2011 16:41:31 +0000 (09:41 -0700)]
Add hostapd utility
Change-Id: I88dadaa8226a4a15849c4267564992466f62def4
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
The Android Automerger [Fri, 22 Jul 2011 16:40:35 +0000 (09:40 -0700)]
HLK22
Change-Id: I94e1ed33ee90f23d21f8e0fe6f8024eb2254241f
The Android Automerger [Fri, 22 Jul 2011 16:40:24 +0000 (09:40 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
Ying Wang [Thu, 21 Jul 2011 16:33:36 +0000 (09:33 -0700)]
Merge "Put the NDK library paths ahead of TARGET_GLOBAL_LD_DIRS"
The Android Open Source Project [Thu, 21 Jul 2011 14:26:42 +0000 (07:26 -0700)]
Reconcile with honeycomb-LTE-release
Change-Id: I34aedca62dce89222c1923e53c0082a3dcc65ec3
The Android Open Source Project [Thu, 21 Jul 2011 14:23:51 +0000 (07:23 -0700)]
Reconcile with gingerbread-mr4-release
Change-Id: Ie476582431135ba95f6d04d0321493c7c4cb7530
The Android Automerger [Thu, 21 Jul 2011 14:21:29 +0000 (07:21 -0700)]
HLK21
Change-Id: Iabe6d5dfff4f1eca685b09c87bf1f38865f0167c
The Android Automerger [Thu, 21 Jul 2011 14:21:25 +0000 (07:21 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
Ying Wang [Wed, 20 Jul 2011 22:42:53 +0000 (15:42 -0700)]
Put the NDK library paths ahead of TARGET_GLOBAL_LD_DIRS
To avoid race condition:
Say a module with LOCAL_NDK_VERSION built in the full source tree,
Before this change it may be linked against TARGET_GLOBAL_LD_DIRS/libc.so
that's being partially written out by the linker, because there is no dependency
between the module and TARGET_GLOBAL_LD_DIRS/libc.so.
Change-Id: If6e4921d226fee133b53e4d819a07b48f4fca016
David Hu [Wed, 20 Jul 2011 18:56:20 +0000 (11:56 -0700)]
Merge "Added ConnectivityTest package as part of the sdk build."
The Android Open Source Project [Wed, 20 Jul 2011 15:56:53 +0000 (08:56 -0700)]
Reconcile with honeycomb-LTE-release
Change-Id: I4505a64656a03777b964d267b6b0c767f601d8cd
The Android Automerger [Wed, 20 Jul 2011 15:33:57 +0000 (08:33 -0700)]
GWK15B
Change-Id: Ic5b7128218c8d7a20b85b5208b158f7901b6ac20
The Android Automerger [Wed, 20 Jul 2011 14:21:04 +0000 (07:21 -0700)]
HLK20
Change-Id: Id5e729d4e16fd4a3f8ab91e490d1034d299606c6
The Android Automerger [Wed, 20 Jul 2011 14:20:56 +0000 (07:20 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Wed, 20 Jul 2011 07:27:31 +0000 (00:27 -0700)]
Set BUILD_ID to GWK15B.
Change-Id: Ia4cd9cba4771c2793afb1d4812157719437b0662
The Android Open Source Project [Tue, 19 Jul 2011 17:10:30 +0000 (10:10 -0700)]
Reconcile with honeycomb-LTE-release
Change-Id: I23ee9d5a76c931031ca51bc9b93938cd48c39498
The Android Automerger [Tue, 19 Jul 2011 14:16:12 +0000 (07:16 -0700)]
HLK19
Change-Id: I003e95a859cb73fad40d6069aa5521f34660a927
The Android Automerger [Tue, 19 Jul 2011 14:16:04 +0000 (07:16 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Mon, 18 Jul 2011 23:03:14 +0000 (16:03 -0700)]
HLK18B
Change-Id: Id19ef186c942370c8ddf9c2e0bdfa5651469fbb5
The Android Automerger [Mon, 18 Jul 2011 23:03:08 +0000 (16:03 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
Marco Nelissen [Mon, 18 Jul 2011 21:46:09 +0000 (14:46 -0700)]
Add music effects control panel to the build.
Change-Id: If4cccd929b103d43dcd48f9ad453e2f850061b5d
Kenny Root [Mon, 18 Jul 2011 21:47:21 +0000 (14:47 -0700)]
am
3146eb76: am
1708a6f7: am
4880b436: am
62a2b188: Merge "Avoid complaining about empty directories"
* commit '
3146eb76cf193ce95f0f88a477b1c708a1b5cf9b':
Avoid complaining about empty directories
Kenny Root [Mon, 18 Jul 2011 20:48:43 +0000 (13:48 -0700)]
am
1708a6f7: am
4880b436: am
62a2b188: Merge "Avoid complaining about empty directories"
* commit '
1708a6f74bf36ad6d520476895695c26bdaf7306':
Avoid complaining about empty directories
Kenny Root [Mon, 18 Jul 2011 20:47:16 +0000 (13:47 -0700)]
am
4880b436: am
62a2b188: Merge "Avoid complaining about empty directories"
* commit '
4880b436656d7cfd00bb82ebde1b408e0bd19bda':
Avoid complaining about empty directories
Kenny Root [Mon, 18 Jul 2011 20:45:15 +0000 (13:45 -0700)]
am
62a2b188: Merge "Avoid complaining about empty directories"
* commit '
62a2b1882fb95e960b5889b46fe8f669ddc7c8ac':
Avoid complaining about empty directories
Kenny Root [Mon, 18 Jul 2011 20:41:25 +0000 (13:41 -0700)]
Merge "Avoid complaining about empty directories"
Kenny Root [Mon, 18 Jul 2011 20:11:34 +0000 (13:11 -0700)]
Avoid complaining about empty directories
Change-Id: If46bffd1c4e6b94f2e476b2d7d506ef337bbf8e1
Kenny Root [Mon, 18 Jul 2011 19:06:40 +0000 (12:06 -0700)]
am
1b61d1ba: am
db549686: am
099aa4cf: am
b8a1c89b: Merge "Only include "[a-z]*.bash" files for completion"
* commit '
1b61d1ba7b7f2c0017193bcfc3a28e30af1ce603':
Only include "[a-z]*.bash" files for completion
Kenny Root [Mon, 18 Jul 2011 19:01:29 +0000 (12:01 -0700)]
am
db549686: am
099aa4cf: am
b8a1c89b: Merge "Only include "[a-z]*.bash" files for completion"
* commit '
db5496867968fe592de807e606dc11287ca61c6a':
Only include "[a-z]*.bash" files for completion
Kenny Root [Mon, 18 Jul 2011 18:57:24 +0000 (11:57 -0700)]
am
099aa4cf: am
b8a1c89b: Merge "Only include "[a-z]*.bash" files for completion"
* commit '
099aa4cf4d82218110c6edf3edede0e72450216e':
Only include "[a-z]*.bash" files for completion
Kenny Root [Mon, 18 Jul 2011 18:54:15 +0000 (11:54 -0700)]
am
b8a1c89b: Merge "Only include "[a-z]*.bash" files for completion"
* commit '
b8a1c89b3a848ea343c897b33e77455dc2f98119':
Only include "[a-z]*.bash" files for completion
Kenny Root [Mon, 18 Jul 2011 18:44:26 +0000 (11:44 -0700)]
Merge "Only include "[a-z]*.bash" files for completion"
Kenny Root [Mon, 18 Jul 2011 18:15:31 +0000 (11:15 -0700)]
Only include "[a-z]*.bash" files for completion
Some people were using case-insensitive filesystems which broke when
including simply [a-z]* since it matched the uppercase files. Use this
to filter only the actual bash scripts.
Change-Id: Ibfdcf2c091a154f0485545537a044667783a19f7
Eric Laurent [Mon, 18 Jul 2011 15:43:35 +0000 (08:43 -0700)]
Merge "Added audio pre processing library"
The Android Open Source Project [Mon, 18 Jul 2011 15:09:54 +0000 (08:09 -0700)]
Reconcile with gingerbread-release honeycomb-LTE-release
Change-Id: I8e396934afd0c48b07bb5e28973f0c3e16beb8bb
OSDN Git Service
