OSDN Git Service
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
Ying Wang [Tue, 24 May 2011 23:27:29 +0000 (16:27 -0700)]
Merge "Fix use of intermediates in droiddoc"
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: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: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: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: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: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: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:07:57 +0000 (06:07 -0700)]
HLJ42
Change-Id: I484952f2d0dd5ac33136232473eb39cc52d5c47d
The Android Automerger [Thu, 12 May 2011 13:07:52 +0000 (06:07 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
Dianne Hackborn [Wed, 11 May 2011 22:13:18 +0000 (15:13 -0700)]
am
477e9632: (-s ours) am
ea4d9f55: am
22b5d621: DO NOT MERGE. We are now dev branch for Honeycomb MR2.
* commit '
477e963276a1fb3759cbf40fc4ea1039b0d22057':
DO NOT MERGE. We are now dev branch for Honeycomb MR2.
Andreas Huber [Wed, 11 May 2011 21:39:02 +0000 (14:39 -0700)]
Cleanspec for change 109590
Change-Id: Icd4a6c3963d33b813e212015d954e9f06a489a05
Dianne Hackborn [Wed, 11 May 2011 20:49:50 +0000 (13:49 -0700)]
am
ea4d9f55: am
22b5d621: DO NOT MERGE. We are now dev branch for Honeycomb MR2.
* commit '
ea4d9f557b20e7a4ef77e6ac0c573cf3a9a5fd3a':
DO NOT MERGE. We are now dev branch for Honeycomb MR2.
Dianne Hackborn [Wed, 11 May 2011 20:35:36 +0000 (13:35 -0700)]
am
22b5d621: DO NOT MERGE. We are now dev branch for Honeycomb MR2.
* commit '
22b5d62172f1563a2513dea314c037703cddf217':
DO NOT MERGE. We are now dev branch for Honeycomb MR2.
Jean-Baptiste Queru [Wed, 11 May 2011 17:40:43 +0000 (10:40 -0700)]
Remove simulator from the lunch menu
Change-Id: I0d73b4722ce5126b64538ca7add2e55cd561c022
The Android Automerger [Wed, 11 May 2011 14:02:39 +0000 (07:02 -0700)]
HTJ41
Change-Id: I2feded7a9ad0af9fc69ac4ca595a3401f2069128
The Android Automerger [Wed, 11 May 2011 14:02:35 +0000 (07:02 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
The Android Automerger [Wed, 11 May 2011 13:09:44 +0000 (06:09 -0700)]
HLJ41
Change-Id: Iefcea59b02c0b9e541fe2b96d04d9a4461d796f6
The Android Automerger [Wed, 11 May 2011 13:09:36 +0000 (06:09 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
Christopher Tate [Mon, 18 Apr 2011 23:07:24 +0000 (16:07 -0700)]
Add bu and BackupRestoreConfirmation to the core build
The 'bu' program is used by the platform's local backup mechanism
to stream a 'tar'-compatible dump of application packages/data.
BackupRestoreConfirmation is the UI for verifying that the user
did is aware of & grants permission for a requested full backup or
restore operation.
Change-Id: I3a3fe345e89d09838bddc4010d429e1374e19440
Jean-Baptiste Queru [Tue, 10 May 2011 15:29:49 +0000 (08:29 -0700)]
Use actual numbers in version numbers.
This string is used in the browser user agent, and some
sites get confused when this isn't a dotted-number version
number into thinking that they should serve stripped down HTML.
This clears the confusion.
Change-Id: I6c959ff17c540a1f3808f19238b9eb93ba170d2e
The Android Automerger [Tue, 10 May 2011 14:07:46 +0000 (07:07 -0700)]
HTJ40
Change-Id: I69a397254764b50a6ecf793c5012ecae6fb4c956
The Android Automerger [Tue, 10 May 2011 14:07:34 +0000 (07:07 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
The Android Automerger [Tue, 10 May 2011 13:07:42 +0000 (06:07 -0700)]
HLJ40
Change-Id: I03814229417ccaff2aecfb1ca421ced9dd3d1f5a
The Android Automerger [Tue, 10 May 2011 13:07:25 +0000 (06:07 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
Dianne Hackborn [Tue, 10 May 2011 01:21:14 +0000 (18:21 -0700)]
DO NOT MERGE. We are now dev branch for Honeycomb MR2.
Change-Id: Icde20a70a35fc28e168eba4809c1c011ac5265b4
T.R. Fullhart [Tue, 10 May 2011 00:54:01 +0000 (17:54 -0700)]
GRJ39
Change-Id: Ia991a6c0512267d7928747cd41900201f8785879
The Android Automerger [Mon, 9 May 2011 14:07:37 +0000 (07:07 -0700)]
HTJ39
Change-Id: Ie5a62cd1e0cba4e66e53601d797ebd46a444615b
The Android Automerger [Mon, 9 May 2011 14:07:21 +0000 (07:07 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
The Android Automerger [Mon, 9 May 2011 13:07:40 +0000 (06:07 -0700)]
HLJ39
Change-Id: I561bd92faefe6267a1ba8cb4448f97210128b65b
The Android Automerger [Mon, 9 May 2011 13:07:28 +0000 (06:07 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Sat, 7 May 2011 08:34:22 +0000 (01:34 -0700)]
HMJ37
Change-Id: I2e7712c0911418b011e3ba18a193e31ce554513e
The Android Automerger [Sat, 7 May 2011 08:33:56 +0000 (01:33 -0700)]
merge in honeycomb-mr1-release history after reset to honeycomb-mr1
The Android Automerger [Fri, 6 May 2011 19:17:41 +0000 (12:17 -0700)]
HLJ36B
Change-Id: I5b0a0a27f276acb811d2f9e14a7561f3e9ad6584
The Android Automerger [Fri, 6 May 2011 19:17:29 +0000 (12:17 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Fri, 6 May 2011 14:56:24 +0000 (07:56 -0700)]
HTJ36
Change-Id: Idcf387b729e2e6c9091ff4e1325a4a5f73866317
The Android Automerger [Fri, 6 May 2011 14:56:12 +0000 (07:56 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
The Android Automerger [Fri, 6 May 2011 13:08:24 +0000 (06:08 -0700)]
HLJ36
Change-Id: I04f446c67f3b9d4c432d7848e4e6e9c8d47beeb5
The Android Automerger [Fri, 6 May 2011 13:08:13 +0000 (06:08 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Fri, 6 May 2011 00:05:08 +0000 (17:05 -0700)]
HMJ35B
Change-Id: Iaf6a8a2ede62d1d4da33b3997bb1d2f781e74ba4
The Android Automerger [Fri, 6 May 2011 00:04:59 +0000 (17:04 -0700)]
merge in honeycomb-mr1-release history after reset to honeycomb-mr1
The Android Automerger [Thu, 5 May 2011 22:29:27 +0000 (15:29 -0700)]
HMJ35
Change-Id: Idf1f39013d6ee1aa15e3b95c77d178728f5865bb
The Android Automerger [Thu, 5 May 2011 22:29:06 +0000 (15:29 -0700)]
merge in honeycomb-mr1-release history after reset to honeycomb-mr1
android-merger [Thu, 5 May 2011 20:07:24 +0000 (13:07 -0700)]
GRJ35
Change-Id: I6cc9e3c61eef4cb56142fdfe6f7cac3434f81a7b
The Android Automerger [Thu, 5 May 2011 16:51:24 +0000 (09:51 -0700)]
HTJ35
Change-Id: I7bfb6a0fcaba84e6475bcb212e91bedc6edd333a
The Android Automerger [Thu, 5 May 2011 16:51:18 +0000 (09:51 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
The Android Automerger [Thu, 5 May 2011 16:39:50 +0000 (09:39 -0700)]
HT = hc mr2
Change-Id: I3d9bdd1eed2ddb6ff2e6b09da756316b4805f6c7
The Android Automerger [Thu, 5 May 2011 13:07:33 +0000 (06:07 -0700)]
HLJ35
Change-Id: Ib8fe66e435d22c211fd90839854478e9abfc5ae0
The Android Automerger [Thu, 5 May 2011 13:07:19 +0000 (06:07 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Wed, 4 May 2011 22:57:41 +0000 (15:57 -0700)]
HMJ34
Change-Id: I08475d973aadb1c031c22af7b89cf7603f0f1634
The Android Automerger [Wed, 4 May 2011 22:57:29 +0000 (15:57 -0700)]
merge in honeycomb-mr1-release history after reset to honeycomb-mr1
The Android Automerger [Wed, 4 May 2011 13:46:37 +0000 (06:46 -0700)]
HLJ34
Change-Id: I2451a929586d4fd6c9f9f93a16569dbcbabf4b04
The Android Automerger [Wed, 4 May 2011 13:46:16 +0000 (06:46 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
OSDN Git Service
