OSDN Git Service
The Android Automerger [Wed, 1 Jun 2011 13:42:40 +0000 (06:42 -0700)]
IRJ62
Change-Id: Ice8255d6028d9b7a11abba53860fedf9084767c0
The Android Automerger [Wed, 1 Jun 2011 13:42:34 +0000 (06:42 -0700)]
merge in ics-release history after reset to master
Joe Onorato [Wed, 1 Jun 2011 01:21:07 +0000 (18:21 -0700)]
Switch the java encoding from ascii to utf8.
Change-Id: Iee0972df68b44fc8c653812cf165b57350a7ec5d
Dan Bornstein [Tue, 31 May 2011 17:29:47 +0000 (10:29 -0700)]
Clean up how dex preoptimization gets configured.
Change-Id: I505ac438f1b963060b4be36d94bb5fbee6112dc5
The Android Automerger [Tue, 31 May 2011 13:40:54 +0000 (06:40 -0700)]
IRJ61
Change-Id: I82f7607bdae235d7cd2eff52616f3cc9e7ec6a87
The Android Automerger [Tue, 31 May 2011 13:40:50 +0000 (06:40 -0700)]
merge in ics-release history after reset to master
The Android Automerger [Mon, 30 May 2011 13:43:41 +0000 (06:43 -0700)]
IRJ60
Change-Id: I670171d98e3fad75d63900ec9ebf4565bdafba8f
The Android Automerger [Mon, 30 May 2011 13:43:33 +0000 (06:43 -0700)]
merge in ics-release history after reset to master
Mathias Agopian [Fri, 27 May 2011 23:38:05 +0000 (16:38 -0700)]
Merge "add sensorservice package to the list"
Eric Laurent [Wed, 18 May 2011 02:21:55 +0000 (19:21 -0700)]
Added audio effects config file.
A configuration file named audio_effects.conf is now used
to list audio effect libraries and engines to be loaded by the
effects factory. A default version of this file is installed
in /system/etc. OEMs can override this file by placing a file
with the same name under /vendor/etc.
Change-Id: Id10e0e54f53234ec52b22b6f882734edaf2648ac
Hugo Hudson [Fri, 27 May 2011 18:43:03 +0000 (11:43 -0700)]
Merge "Add the voicemail provider to the core packages."
The Android Automerger [Fri, 27 May 2011 18:39:43 +0000 (11:39 -0700)]
IRJ57B
Change-Id: I6b6e332c11dacfcd713cc6219d2fcf467612a8cb
Jaikumar Ganesh [Fri, 27 May 2011 18:38:50 +0000 (11:38 -0700)]
Merge "Remove bluetooth configuration file."
Marius Renn [Fri, 27 May 2011 17:26:44 +0000 (10:26 -0700)]
Merge "Added libfilterfw to core.mk."
The Android Automerger [Fri, 27 May 2011 13:42:23 +0000 (06:42 -0700)]
IRJ57
Change-Id: Iec94a5ecdc9491c85aadf96b27751419c7b6ed88
The Android Automerger [Fri, 27 May 2011 13:42:07 +0000 (06:42 -0700)]
merge in ics-release history after reset to master
Hugo Hudson [Fri, 27 May 2011 10:54:10 +0000 (11:54 +0100)]
Add the voicemail provider to the core packages.
Change-Id: I6a9f14a1129afffa0f80fb33977a98654ea61ccf
Brian Carlstrom [Fri, 27 May 2011 07:04:57 +0000 (00:04 -0700)]
Breakup android.core.tests.libcore based on top level package name
git cherry-pick --no-commit
ec122eb2c11dfb8553d3707208a1ecbe7366f61b
Change-Id: I685ece362674f83f179ace34367fce88a7f541fb
Mathias Agopian [Fri, 27 May 2011 04:53:25 +0000 (21:53 -0700)]
add sensorservice package to the list
Change-Id: I1ab54a7461095f37ea8bdeb480caffafe96a9522
Marius Renn [Fri, 27 May 2011 01:06:55 +0000 (18:06 -0700)]
Added libfilterfw to core.mk.
Change-Id: Idb4c50bec8ae4328849736a7a120343276b45766
Ying Wang [Thu, 26 May 2011 20:43:57 +0000 (13:43 -0700)]
Fix possible unnecessary rebuild
This fix the unnecessary rebuild in the following scenario:
A package rename its manifest package name and the old R.java was still
in its intermediate dir. The rule to generate R_file_stamp may always
copy the old R.java with timestamp reserved and the R_file_stamp never
gets updated.
Change-Id: I659cbb00f0e7734d7d71e1ca66065f587c8dee2c
Jaikumar Ganesh [Thu, 26 May 2011 18:10:31 +0000 (11:10 -0700)]
Remove bluetooth configuration file.
This now needs to be controlled on a per product basis
rather than telephony / no telephony basis.
Change-Id: I581bc0e027f844c1f7b7262c3833d8f727c3c9ec
The Android Automerger [Thu, 26 May 2011 14:45:16 +0000 (07:45 -0700)]
IRJ56
Change-Id: I65702d7f822093eb6e5f9a8556301256bace42c4
The Android Automerger [Thu, 26 May 2011 14:45:03 +0000 (07:45 -0700)]
merge in ics-release history after reset to master
The Android Automerger [Wed, 25 May 2011 13:42:13 +0000 (06:42 -0700)]
IRJ55
Change-Id: I0b077ec800fb6a22f4bd5b0c8ad97b07ef7b6962
The Android Automerger [Wed, 25 May 2011 13:42:07 +0000 (06:42 -0700)]
merge in ics-release history after reset to master
Ying Wang [Tue, 24 May 2011 23:27:29 +0000 (16:27 -0700)]
Merge "Fix use of intermediates in droiddoc"
The Android Automerger [Tue, 24 May 2011 13:41:55 +0000 (06:41 -0700)]
IRJ54
Change-Id: Iea0aa7a8b2bf269a4b23d00d24dc890cc9805e21
The Android Automerger [Tue, 24 May 2011 13:41:38 +0000 (06:41 -0700)]
merge in ics-release history after reset to master
The Android Automerger [Mon, 23 May 2011 21:19:47 +0000 (14:19 -0700)]
IRJ53B
Change-Id: Ifa3526f95a10ffe51e9b84118aae95c8f3a9ec3c
The Android Automerger [Mon, 23 May 2011 13:40:43 +0000 (06:40 -0700)]
IRJ53
Change-Id: I68348dffb7367a9330e26ca0d57f7e4f60417b56
The Android Automerger [Mon, 23 May 2011 13:40:30 +0000 (06:40 -0700)]
merge in ics-release history after reset to master
The Android Automerger [Fri, 20 May 2011 22:31:35 +0000 (15:31 -0700)]
IRJ50B
Change-Id: Iabf6e946499767752d025eb3794745b696ef0e75
The Android Automerger [Fri, 20 May 2011 22:31:28 +0000 (15:31 -0700)]
merge in ics-release history after reset to master
The Android Open Source Project [Fri, 20 May 2011 21:23:31 +0000 (14:23 -0700)]
Reconcile with gingerbread-release honeycomb-release honeycomb-mr1-release honeycomb-mr2-release honeycomb-LTE-release
Change-Id: Ieee6a3fece693ded9f20f8c94f1dcf2cc672072b
Jean-Baptiste Queru [Fri, 20 May 2011 17:59:47 +0000 (10:59 -0700)]
Merge "Switch to mksh as the default shell."
The Android Automerger [Fri, 20 May 2011 14:09:02 +0000 (07:09 -0700)]
HTJ50
Change-Id: I3db4ee9078094fe2ca1bdcee52b7c34e4efb8d85
The Android Automerger [Fri, 20 May 2011 14:08:58 +0000 (07:08 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
The Android Automerger [Fri, 20 May 2011 13:41:24 +0000 (06:41 -0700)]
IRJ50
Change-Id: Ib5c500fc57cbfed95205529ff4f6d5bbd692d9ba
The Android Automerger [Fri, 20 May 2011 13:41:19 +0000 (06:41 -0700)]
merge in ics-release history after reset to master
The Android Automerger [Fri, 20 May 2011 13:09:45 +0000 (06:09 -0700)]
HLJ50
Change-Id: If575aa28cb80a3490a49d9e22222eb8eb3e62ae5
The Android Automerger [Fri, 20 May 2011 13:09:40 +0000 (06:09 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
Jean-Baptiste Queru [Thu, 19 May 2011 22:17:21 +0000 (15:17 -0700)]
am
cdef4045: (-s ours) Merge
5d66a07d - do not merge
* commit '
cdef404572a71ea320f59643c52143764bd590fe':
Use actual numbers in version numbers.
Jean-Baptiste Queru [Thu, 19 May 2011 21:30:26 +0000 (14:30 -0700)]
Merge
5d66a07d - do not merge
Change-Id: I787a6d5d5c79e7122ed506cd6d9e373e7d1049f4
Jean-Baptiste Queru [Thu, 19 May 2011 20:57:00 +0000 (13:57 -0700)]
Merge "Use actual numbers in version numbers."
The Android Automerger [Thu, 19 May 2011 14:08:43 +0000 (07:08 -0700)]
HTJ49
Change-Id: I1178be6de8832ff8febc6e466f4b4b3a92d487da
The Android Automerger [Thu, 19 May 2011 14:08:38 +0000 (07:08 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
The Android Automerger [Thu, 19 May 2011 13:40:52 +0000 (06:40 -0700)]
IRJ49
Change-Id: I6f215ceb179d9e92814d3159fed567593f4d51bd
The Android Automerger [Thu, 19 May 2011 13:40:39 +0000 (06:40 -0700)]
merge in ics-release history after reset to master
The Android Automerger [Thu, 19 May 2011 13:08:38 +0000 (06:08 -0700)]
HLJ49
Change-Id: I718a1b761026950ac1712f18f39c4d219e1d20e0
The Android Automerger [Thu, 19 May 2011 13:08:33 +0000 (06:08 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
Jean-Baptiste Queru [Wed, 18 May 2011 20:49:08 +0000 (13:49 -0700)]
Switch to mksh as the default shell.
Switch the emulator builds to ash to make sure it still
works, in case we find that we need to go back to using ash.
Change-Id: Id5641940b63cc4225011be1c375f4c86ec4d21cc
The Android Automerger [Wed, 18 May 2011 14:09:16 +0000 (07:09 -0700)]
HTJ48
Change-Id: I1f032567bfd8c8e07c39cfd3be7ea296076903b6
The Android Automerger [Wed, 18 May 2011 14:09:12 +0000 (07:09 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
The Android Automerger [Wed, 18 May 2011 13:40:31 +0000 (06:40 -0700)]
IRJ48
Change-Id: I5a40cf28000661e5fd722a357c6142b11f2f101c
The Android Automerger [Wed, 18 May 2011 13:40:26 +0000 (06:40 -0700)]
merge in ics-release history after reset to master
The Android Automerger [Wed, 18 May 2011 13:09:56 +0000 (06:09 -0700)]
HLJ48
Change-Id: Id99ec7468fec0cdfb83037ae04402171095cd7ea
The Android Automerger [Wed, 18 May 2011 13:09:49 +0000 (06:09 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
Ying Wang [Tue, 17 May 2011 21:48:10 +0000 (14:48 -0700)]
Fix use of intermediates in droiddoc
Droiddoc should be product-independent.
Change-Id: I23ac746330ce7cd0ad47d49c01dcfa824228d60c
The Android Automerger [Tue, 17 May 2011 14:08:46 +0000 (07:08 -0700)]
HTJ47
Change-Id: I6ff5d200c839b8478f0f68e80d5a9e153356be9b
The Android Automerger [Tue, 17 May 2011 14:08:42 +0000 (07:08 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
The Android Automerger [Tue, 17 May 2011 13:40:50 +0000 (06:40 -0700)]
IRJ47
Change-Id: I47a87d0ab1a60d10941d3ee4186194349dc75985
The Android Automerger [Tue, 17 May 2011 13:40:44 +0000 (06:40 -0700)]
merge in ics-release history after reset to master
The Android Automerger [Tue, 17 May 2011 13:08:32 +0000 (06:08 -0700)]
HLJ47
Change-Id: I4d30bf58dbb6f753d55ea0b79177870832951d82
The Android Automerger [Tue, 17 May 2011 13:08:27 +0000 (06:08 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
Tsu Chiang Chuang [Mon, 16 May 2011 23:10:43 +0000 (16:10 -0700)]
Merge "adding TF dependency to vm-tf, since now we are using cts-tf things."
Tsu Chiang Chuang [Sun, 15 May 2011 19:03:27 +0000 (12:03 -0700)]
adding TF dependency to vm-tf, since now we are using cts-tf things.
Change-Id: Ia7538dc204faa93f47cd3fd104ed05c9da3e8741
Scott Main [Mon, 16 May 2011 19:25:17 +0000 (12:25 -0700)]
am
c9395fc3: am
8d29d2dc: am
9d27a153: am
faf8baaf: docs: make featured video titles smaller so they don\'t line wrap
* commit '
c9395fc341fda71d95e622668545990fe94cdd5c':
docs: make featured video titles smaller so they don't line wrap
Scott Main [Mon, 16 May 2011 19:22:27 +0000 (12:22 -0700)]
am
8d29d2dc: am
9d27a153: am
faf8baaf: docs: make featured video titles smaller so they don\'t line wrap
* commit '
8d29d2dc670cc990fa6824fdd7ba25edb2a479f2':
docs: make featured video titles smaller so they don't line wrap
Scott Main [Mon, 16 May 2011 19:19:13 +0000 (12:19 -0700)]
am
9d27a153: am
faf8baaf: docs: make featured video titles smaller so they don\'t line wrap
* commit '
9d27a153f714a312f844a35a0140e3fb1752f4e8':
docs: make featured video titles smaller so they don't line wrap
Scott Main [Mon, 16 May 2011 19:17:20 +0000 (12:17 -0700)]
am
faf8baaf: docs: make featured video titles smaller so they don\'t line wrap
* commit '
faf8baaff126aec214608acb9107c20066e0cb00':
docs: make featured video titles smaller so they don't line wrap
Scott Main [Mon, 16 May 2011 19:12:58 +0000 (12:12 -0700)]
docs: make featured video titles smaller so they don't line wrap
Change-Id: I5f4dc06e467a30b579c2710ac1d96a350ef77ff2
Andreas Huber [Mon, 16 May 2011 16:42:49 +0000 (09:42 -0700)]
Add stagefright software decoders to core.mk
Change-Id: I9ecb8bbf179607bcdcb37db43cc11248201ea41f
related-to-bug:
4427361
The Android Automerger [Mon, 16 May 2011 14:11:03 +0000 (07:11 -0700)]
HTJ46
Change-Id: I0c3df08c5264a4bf80edb4c35e309ac2d8a7a7e1
The Android Automerger [Mon, 16 May 2011 14:10:58 +0000 (07:10 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
The Android Automerger [Mon, 16 May 2011 13:40:48 +0000 (06:40 -0700)]
IRJ46
Change-Id: Ibd0edd7c846a6d8584ab2325e709918c3386e8b6
The Android Automerger [Mon, 16 May 2011 13:40:37 +0000 (06:40 -0700)]
merge in ics-release history after reset to master
The Android Automerger [Mon, 16 May 2011 13:00:48 +0000 (06:00 -0700)]
HLJ46
Change-Id: Ia6f600e2d0741d23b9cc1be1cf159430041f69e8
The Android Automerger [Mon, 16 May 2011 13:00:42 +0000 (06:00 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Mon, 16 May 2011 03:12:55 +0000 (20:12 -0700)]
HLJ45
Change-Id: Ib4f53560a6c81ca44203207e7fbe18e0808e878f
The Android Automerger [Mon, 16 May 2011 03:12:50 +0000 (20:12 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Sat, 14 May 2011 05:14:29 +0000 (22:14 -0700)]
HLJ43B
Change-Id: Idc37d0305218505100025ff19dd6fb4c6254e684
The Android Automerger [Sat, 14 May 2011 05:14:23 +0000 (22:14 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Fri, 13 May 2011 21:27:49 +0000 (14:27 -0700)]
GRJ43
Change-Id: I17c44f6b0635c30509d8c91e16ee6dcfc6f12a6f
The Android Automerger [Fri, 13 May 2011 21:27:38 +0000 (14:27 -0700)]
merge in gingerbread-release history after reset to gingerbread
The Android Automerger [Fri, 13 May 2011 14:08:24 +0000 (07:08 -0700)]
HTJ43
Change-Id: I05fe223f0d9058eacfc2c5b05c5701e3413a96fa
The Android Automerger [Fri, 13 May 2011 14:08:20 +0000 (07:08 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
The Android Automerger [Fri, 13 May 2011 13:39:47 +0000 (06:39 -0700)]
IRJ43
Change-Id: I3e090e4aacb1a0baab23d3cfc3f59a341220bac6
The Android Automerger [Fri, 13 May 2011 13:39:36 +0000 (06:39 -0700)]
merge in ics-release history after reset to master
The Android Automerger [Fri, 13 May 2011 13:07:57 +0000 (06:07 -0700)]
HLJ43
Change-Id: Ie16a7790fe0b2f3cf02651b498318a73e50fbb09
The Android Automerger [Fri, 13 May 2011 13:07:50 +0000 (06:07 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Thu, 12 May 2011 22:19:48 +0000 (15:19 -0700)]
HLJ42B
Change-Id: I638a7e308855b67b39820c1e91da2ce22a468a92
The Android Automerger [Thu, 12 May 2011 22:19:43 +0000 (15:19 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
Andreas Huber [Thu, 12 May 2011 16:29:27 +0000 (09:29 -0700)]
Merge "Cleanspec for change 109590"
Jean-Baptiste Queru [Thu, 12 May 2011 16:01:31 +0000 (09:01 -0700)]
am
bdb72318: am
5372220a: Merge "Remove simulator from the lunch menu"
* commit '
bdb72318e47d38df2180bd00d0fd0a97bdc82255':
Remove simulator from the lunch menu
Jean-Baptiste Queru [Thu, 12 May 2011 15:52:59 +0000 (08:52 -0700)]
am
5372220a: Merge "Remove simulator from the lunch menu"
* commit '
5372220a1a12a715ca1242dcc3f4b11b89a8387a':
Remove simulator from the lunch menu
Jean-Baptiste Queru [Thu, 12 May 2011 15:04:50 +0000 (08:04 -0700)]
Merge "Remove simulator from the lunch menu"
The Android Automerger [Thu, 12 May 2011 14:08:03 +0000 (07:08 -0700)]
HTJ42
Change-Id: I774abd20009d2b0ff5dd2a50eb6549d1f4ca2d9b
The Android Automerger [Thu, 12 May 2011 14:07:59 +0000 (07:07 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
The Android Automerger [Thu, 12 May 2011 13:39:53 +0000 (06:39 -0700)]
IRJ42
Change-Id: I3a53f449aea2c924000ed2b684c3e4e813a1e989
OSDN Git Service
