Hugo Hudson
61fec12d7f
Add the voicemail provider to the core packages.
...
Change-Id: I6a9f14a1129afffa0f80fb33977a98654ea61ccf
2011-05-27 11:54:10 +01:00
Ying Wang
bd08b7e415
Merge "Fix use of intermediates in droiddoc"
2011-05-24 16:27:29 -07:00
The Android Open Source Project
ca8cd5bdc3
Reconcile with gingerbread-release honeycomb-release honeycomb-mr1-release honeycomb-mr2-release honeycomb-LTE-release
...
Change-Id: Ieee6a3fece693ded9f20f8c94f1dcf2cc672072b
2011-05-20 14:23:31 -07:00
Jean-Baptiste Queru
61a211eec6
Merge "Switch to mksh as the default shell."
2011-05-20 10:59:47 -07:00
The Android Automerger
8183c40691
HTJ50
...
Change-Id: I3db4ee9078094fe2ca1bdcee52b7c34e4efb8d85
2011-05-20 07:09:02 -07:00
The Android Automerger
b2fb7b071b
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
2011-05-20 07:08:58 -07:00
The Android Automerger
464482e203
HLJ50
...
Change-Id: If575aa28cb80a3490a49d9e22222eb8eb3e62ae5
2011-05-20 06:09:45 -07:00
The Android Automerger
9536280da6
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
2011-05-20 06:09:40 -07:00
Jean-Baptiste Queru
db773fb584
am cdef4045: (-s ours) Merge 5d66a07d
- do not merge
...
* commit 'cdef404572a71ea320f59643c52143764bd590fe':
Use actual numbers in version numbers.
2011-05-19 15:17:21 -07:00
Jean-Baptiste Queru
cdef404572
Merge 5d66a07d
- do not merge
...
Change-Id: I787a6d5d5c79e7122ed506cd6d9e373e7d1049f4
2011-05-19 14:30:26 -07:00
Jean-Baptiste Queru
5d66a07d44
Merge "Use actual numbers in version numbers."
2011-05-19 13:57:00 -07:00
The Android Automerger
148ff14b74
HTJ49
...
Change-Id: I1178be6de8832ff8febc6e466f4b4b3a92d487da
2011-05-19 07:08:43 -07:00
The Android Automerger
436265f995
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
2011-05-19 07:08:38 -07:00
The Android Automerger
4c41e58639
HLJ49
...
Change-Id: I718a1b761026950ac1712f18f39c4d219e1d20e0
2011-05-19 06:08:38 -07:00
The Android Automerger
10f1e3a88b
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
2011-05-19 06:08:33 -07:00
Jean-Baptiste Queru
772a0f6794
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
2011-05-18 13:49:08 -07:00
The Android Automerger
3c92b71cfd
HTJ48
...
Change-Id: I1f032567bfd8c8e07c39cfd3be7ea296076903b6
2011-05-18 07:09:16 -07:00
The Android Automerger
8fa682bd10
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
2011-05-18 07:09:12 -07:00
The Android Automerger
aeb5d4aa87
HLJ48
...
Change-Id: Id99ec7468fec0cdfb83037ae04402171095cd7ea
2011-05-18 06:09:56 -07:00
The Android Automerger
9075818851
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
2011-05-18 06:09:49 -07:00
Ying Wang
fb790877a0
Fix use of intermediates in droiddoc
...
Droiddoc should be product-independent.
Change-Id: I23ac746330ce7cd0ad47d49c01dcfa824228d60c
2011-05-17 16:13:47 -07:00
The Android Automerger
343c99bf4e
HTJ47
...
Change-Id: I6ff5d200c839b8478f0f68e80d5a9e153356be9b
2011-05-17 07:08:46 -07:00
The Android Automerger
4fa7d334ea
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
2011-05-17 07:08:42 -07:00
The Android Automerger
1cc86e0ad0
HLJ47
...
Change-Id: I4d30bf58dbb6f753d55ea0b79177870832951d82
2011-05-17 06:08:32 -07:00
The Android Automerger
af09452667
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
2011-05-17 06:08:27 -07:00
Tsu Chiang Chuang
1b53fbd61a
Merge "adding TF dependency to vm-tf, since now we are using cts-tf things."
2011-05-16 16:10:43 -07:00
Tsu Chiang Chuang
77440f3c37
adding TF dependency to vm-tf, since now we are using cts-tf things.
...
Change-Id: Ia7538dc204faa93f47cd3fd104ed05c9da3e8741
2011-05-16 14:08:12 -07:00
Scott Main
00659251c3
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
2011-05-16 12:25:17 -07:00
Scott Main
c9395fc341
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
2011-05-16 12:22:27 -07:00
Scott Main
8d29d2dc67
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
2011-05-16 12:19:13 -07:00
Scott Main
9d27a153f7
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
2011-05-16 12:17:20 -07:00
Scott Main
faf8baaff1
docs: make featured video titles smaller so they don't line wrap
...
Change-Id: I5f4dc06e467a30b579c2710ac1d96a350ef77ff2
2011-05-16 12:14:17 -07:00
Andreas Huber
2a954b1add
Add stagefright software decoders to core.mk
...
Change-Id: I9ecb8bbf179607bcdcb37db43cc11248201ea41f
related-to-bug: 4427361
2011-05-16 09:42:49 -07:00
The Android Automerger
f16b42323f
HTJ46
...
Change-Id: I0c3df08c5264a4bf80edb4c35e309ac2d8a7a7e1
2011-05-16 07:11:03 -07:00
The Android Automerger
039739b170
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
2011-05-16 07:10:58 -07:00
The Android Automerger
332ae486c2
HLJ46
...
Change-Id: Ia6f600e2d0741d23b9cc1be1cf159430041f69e8
2011-05-16 06:00:48 -07:00
The Android Automerger
fb6bdc96a3
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
2011-05-16 06:00:42 -07:00
The Android Automerger
97c2869508
HLJ45
...
Change-Id: Ib4f53560a6c81ca44203207e7fbe18e0808e878f
2011-05-15 20:12:55 -07:00
The Android Automerger
6096450e07
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
2011-05-15 20:12:50 -07:00
The Android Automerger
a3a2115b97
HLJ43B
...
Change-Id: Idc37d0305218505100025ff19dd6fb4c6254e684
2011-05-13 22:14:29 -07:00
The Android Automerger
a34955233f
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
2011-05-13 22:14:23 -07:00
The Android Automerger
83270c1713
GRJ43
...
Change-Id: I17c44f6b0635c30509d8c91e16ee6dcfc6f12a6f
2011-05-13 14:27:49 -07:00
The Android Automerger
dcd1f1b8ef
merge in gingerbread-release history after reset to gingerbread
2011-05-13 14:27:38 -07:00
The Android Automerger
a5ea8a2d8d
HTJ43
...
Change-Id: I05fe223f0d9058eacfc2c5b05c5701e3413a96fa
2011-05-13 07:08:24 -07:00
The Android Automerger
093e2e9ae3
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
2011-05-13 07:08:20 -07:00
The Android Automerger
7aa1b54876
HLJ43
...
Change-Id: Ie16a7790fe0b2f3cf02651b498318a73e50fbb09
2011-05-13 06:07:57 -07:00
The Android Automerger
f270543a1e
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
2011-05-13 06:07:50 -07:00
The Android Automerger
a9d031c7dc
HLJ42B
...
Change-Id: I638a7e308855b67b39820c1e91da2ce22a468a92
2011-05-12 15:19:48 -07:00
The Android Automerger
d705714e12
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
2011-05-12 15:19:43 -07:00
Andreas Huber
850b2ffe5a
Merge "Cleanspec for change 109590"
2011-05-12 09:29:27 -07:00