Brad Fitzpatrick
cc8f87e941
am f664d6f9: am b083d3b8: Merge "Initialize resampling buffer per track."
...
* commit 'f664d6f916516860d3e4cf82339d47c6f4fd24a2':
Initialize resampling buffer per track.
2011-02-04 10:30:40 -08:00
Brad Fitzpatrick
f664d6f916
am b083d3b8: Merge "Initialize resampling buffer per track."
...
* commit 'b083d3b816378ef3b9dceb33b2c2e20510b2632b':
Initialize resampling buffer per track.
2011-02-04 10:27:54 -08:00
Brad Fitzpatrick
b083d3b816
Merge "Initialize resampling buffer per track."
2011-02-04 10:19:06 -08:00
Yuuhi Yamaguchi
681d818523
Initialize resampling buffer per track.
...
When resampling too short sound, AudioMixer uses previous
tracks buffer. So we re-initialize the temporary buffer per
loop to avoid it.
Change-Id: I55a59a3b14faa8445e09c450478fe79cef704760
2011-02-04 15:24:34 +01:00
Joe Onorato
2742c9c2c6
am 163c28b5: Merge "Managed dialogs should run on the same thread as their activity." into gingerbread
...
* commit '163c28b5ca0a85be4c3f64c5419eb95fec4a6d43':
Managed dialogs should run on the same thread as their activity.
2011-02-03 18:08:45 -08:00
Joe Onorato
163c28b5ca
Merge "Managed dialogs should run on the same thread as their activity." into gingerbread
2011-02-03 18:05:20 -08:00
Joe Onorato
c7f8b6fcf5
Managed dialogs should run on the same thread as their activity.
...
Bug: 3418998
Change-Id: I9b1cf73f9d6f8a5594f405546fcaa3cfd6f03c45
2011-02-03 17:50:02 -08:00
Nick Pelly
062443f295
am 40684946: Merge "Fix docs type that broke build." into gingerbread
...
* commit '40684946cb00080c1c7424885f49a809816dd26e':
Fix docs type that broke build.
2011-02-03 16:32:29 -08:00
Nick Pelly
40684946cb
Merge "Fix docs type that broke build." into gingerbread
2011-02-03 16:27:51 -08:00
Nick Pelly
46797ac098
Fix docs type that broke build.
...
Change-Id: I5b5a2fc5baf95ace74bf90ff2c750ba890054d64
2011-02-03 16:23:58 -08:00
Jean-Baptiste Queru
501dbaea03
am 6dbdcd55: am db71bda6: Merge from gingerbread
...
* commit '6dbdcd55905e50e533d0d3d9abf735275bca68b6':
2011-02-03 16:21:47 -08:00
Scott Main
51768f4be3
am 779f7410: Merge "cherrypick Change-Id: I6053e6f20045b0ecba4b964f9bfb87c3241d3a91 update dashboard" into gingerbread
...
* commit '779f7410b35267fafb725061d76fc684cd77f26b':
cherrypick Change-Id: I6053e6f20045b0ecba4b964f9bfb87c3241d3a91 update dashboard
2011-02-03 15:56:02 -08:00
Nick Pelly
5394ef0618
am 630ac8df: Merge "NFC documentation overhaul." into gingerbread
...
* commit '630ac8df2478cd0d47a90b95fbb13b9de4ad58b1':
NFC documentation overhaul.
2011-02-03 15:55:53 -08:00
Scott Main
779f7410b3
Merge "cherrypick Change-Id: I6053e6f20045b0ecba4b964f9bfb87c3241d3a91 update dashboard" into gingerbread
2011-02-03 15:24:40 -08:00
Jean-Baptiste Queru
6dbdcd5590
am db71bda6: Merge from gingerbread
...
* commit 'db71bda6f696aff6047e6c26c32e0c08bf6851bc':
2011-02-03 15:24:24 -08:00
Nick Pelly
630ac8df24
Merge "NFC documentation overhaul." into gingerbread
2011-02-03 15:23:17 -08:00
Scott Main
00a600e845
cherrypick Change-Id: I6053e6f20045b0ecba4b964f9bfb87c3241d3a91
...
update dashboard
Change-Id: Iea5d441e417fc1a407c623ec2faf0cff90059592
2011-02-03 15:22:54 -08:00
Nick Pelly
74fe6c6b24
NFC documentation overhaul.
...
Change-Id: I45dca95a24b2d0327e080436fbcc7b1dad79de02
2011-02-03 15:11:09 -08:00
Jean-Baptiste Queru
db71bda6f6
Merge from gingerbread
...
Change-Id: I6b895012db6b96666dc3257b1f2e430925981188
2011-02-03 14:25:38 -08:00
Jean-Baptiste Queru
917d9ea1eb
am 8444023f: Merge from open-source gingerbread
...
* commit '8444023f351b22816f6827d3314ff81b3533e3d9':
Fix the Multi-page SMS sending error to several receipents
2011-02-03 14:09:34 -08:00
Jean-Baptiste Queru
8444023f35
Merge from open-source gingerbread
...
Change-Id: I19c4ba36cf4f2ef518b55768360b0bff1a92a5ab
2011-02-03 14:05:23 -08:00
Jean-Baptiste Queru
4ddd99090e
Merge "Fix the Multi-page SMS sending error to several receipents" into gingerbread
2011-02-03 14:02:59 -08:00
Sang-Jun Park
b9ef00ea2f
Fix the Multi-page SMS sending error to several receipents
...
Change-Id: Iefde94b638413e3c1761f17c3065b20a044e5958
Signed-off-by: Sang-Jun Park <sj2202.park@samsung.com>
2011-02-03 13:39:31 -08:00
Jean-Baptiste Queru
236afa6806
am 375afcd5: am 4b8ad9ef: Merge from gingerbread
...
* commit '375afcd5d69f47c85960270bf51b83a2b768d446':
2011-02-03 13:32:08 -08:00
Jean-Baptiste Queru
375afcd5d6
am 4b8ad9ef: Merge from gingerbread
...
* commit '4b8ad9effd95508e9966b8a3a355f0a948558ae2':
Fix delivery report error with PENDING status in SMS
2011-02-03 13:28:51 -08:00
Jean-Baptiste Queru
4b8ad9effd
Merge from gingerbread
...
Change-Id: Id0509272ef8382fb0004f4d38bbba744e3487a8c
2011-02-03 13:17:49 -08:00
Jean-Baptiste Queru
baaaca1c61
Merge ee4c17ee from gingerbread
...
Change-Id: Ide109e517fb7610d60f31ba6aa99fe665b59d690
2011-02-03 13:03:53 -08:00
Jean-Baptiste Queru
ee4c17eec3
Merge from open-source gingerbread
...
Change-Id: I63e8abc1b8d6db05dfce178ae736d8d0586f6c52
2011-02-03 12:41:51 -08:00
Jean-Baptiste Queru
2703b84caa
Merge "Fix delivery report error with PENDING status in SMS" into gingerbread
2011-02-03 12:17:47 -08:00
Scott Main
2e5fea59c2
am ca69a634: fix broken links, update the dev guide intro, and update sitemap file
...
* commit 'ca69a6340610bfd7e830ff9be64a74085aea037c':
fix broken links, update the dev guide intro, and update sitemap file
2011-02-02 18:08:51 -08:00
Scott Main
ca69a63406
fix broken links, update the dev guide intro, and update sitemap file
...
Change-Id: Icf0c7772901f742c36ba417e07cc5e299f72849a
2011-02-02 17:43:24 -08:00
Scott Main
45c66a0e1c
am 94a6c689: Merge "wholesale manual merge of docs from gingerbread-docs to gingerbread includes misc changes that occured for preview sdk and shortly after plus misc older stuff that got missed" into gingerbread
...
* commit '94a6c689acb03ba01546a10933699bde22bb4a4c':
wholesale manual merge of docs from gingerbread-docs to gingerbread includes misc changes that occured for preview sdk and shortly after plus misc older stuff that got missed
2011-02-02 16:44:55 -08:00
Scott Main
603b475e59
am 4add7f3f: cherrypick Change-Id: I350a012817e6e9fa76fa0e58ab252d457cd103f2 update OEM driver list with new fujitsu and kyocera
...
* commit '4add7f3ffcebe1564d1e492194817afaf107ac16':
cherrypick Change-Id: I350a012817e6e9fa76fa0e58ab252d457cd103f2 update OEM driver list with new fujitsu and kyocera
2011-02-02 16:41:29 -08:00
Scott Main
94a6c689ac
Merge "wholesale manual merge of docs from gingerbread-docs to gingerbread includes misc changes that occured for preview sdk and shortly after plus misc older stuff that got missed" into gingerbread
2011-02-02 16:38:25 -08:00
Scott Main
4add7f3ffc
cherrypick Change-Id: I350a012817e6e9fa76fa0e58ab252d457cd103f2
...
update OEM driver list with new fujitsu and kyocera
Change-Id: Ice11a179fe6a4eb220509fc784ac6f6af5a2fa5e
2011-02-02 16:32:11 -08:00
Scott Main
cbbdefcb71
wholesale manual merge of docs from gingerbread-docs to gingerbread
...
includes misc changes that occured for preview sdk and shortly after
plus misc older stuff that got missed
Change-Id: Ibb8490b2c6bae2d9df15326c7ffbcf83b638acc6
2011-02-02 16:09:45 -08:00
Bill Gruber
930189f0f7
am df71cabb: cherrypick Change-Id: Ica1b68a1687917432d39d7d116c9c24fa1644a83 Initial posting of in-app billing docs
...
* commit 'df71cabbc2f670a4acea91e04f54990a472a56e9':
cherrypick Change-Id: Ica1b68a1687917432d39d7d116c9c24fa1644a83 Initial posting of in-app billing docs
2011-02-02 15:46:52 -08:00
Scott Main
cb2d881765
am 2458f2a1: cherrypick Change-Id: I60c74919ab3df359f47e5052bcc1469318a5b821 add notice about large screen devices and the "mobile" string in user agent
...
* commit '2458f2a1ccf13a9f33c21d8aff260baefac9edb8':
cherrypick Change-Id: I60c74919ab3df359f47e5052bcc1469318a5b821 add notice about large screen devices and the "mobile" string in user agent
2011-02-02 15:44:29 -08:00
Bill Gruber
df71cabbc2
cherrypick Change-Id: Ica1b68a1687917432d39d7d116c9c24fa1644a83
...
Initial posting of in-app billing docs
Change-Id: I26adb5480e556d8f914a3443f1b75c220742245d
2011-02-02 15:42:36 -08:00
Scott Main
2458f2a1cc
cherrypick Change-Id: I60c74919ab3df359f47e5052bcc1469318a5b821
...
add notice about large screen devices and the "mobile" string in user agent
Change-Id: I2e6a3f2c4fced2cf06bb996c1135c042682cdf8f
2011-02-02 15:40:47 -08:00
Scott Main
8b05f6a2af
am 0c1a4d3b: cherrypick Change-Id: Ia4a3488a7f25925b512c0e0ae64c1f5dcf30f680 fix market link on homepage
...
* commit '0c1a4d3b51337784583ef39378ca8796bb8b0992':
cherrypick Change-Id: Ia4a3488a7f25925b512c0e0ae64c1f5dcf30f680 fix market link on homepage
2011-02-02 15:16:13 -08:00
Scott Main
0c1a4d3b51
cherrypick Change-Id: Ia4a3488a7f25925b512c0e0ae64c1f5dcf30f680
...
fix market link on homepage
Change-Id: I1d617c9737e6a3293372bbe70aff0cfa88dfba8c
2011-02-02 15:12:15 -08:00
Irfan Sheriff
ec348b4953
resolved conflicts for merge of 0a4b3fd9 to gingerbread-plus-aosp
...
Change-Id: I294e6e843ae028377d19c1180e0d5e9aef52897c
2011-02-02 14:23:10 -08:00
Irfan Sheriff
0a4b3fd93b
two digit number handling in croatia and serbia
...
If users dial 92-96, dial them normally and not treat
as USSD
Change-Id: If3b6cb37b7ec0ff99d76cb10cba53368094a0b5d
Signed-off-by: sj2202.park@samsung.com
2011-02-02 14:08:38 -08:00
Jean-Baptiste Queru
f6b2beaabd
am 05059b5b: am 8226140c: Merge from gingerbread
...
* commit '05059b5b35ade5957b8dfbb21b09e318a94232ed':
2011-02-02 09:56:30 -08:00
Jean-Baptiste Queru
05059b5b35
am 8226140c: Merge from gingerbread
...
* commit '8226140ccadbc8e0bdd093f8bab0a5292b9224e3':
fix for supporting 3 digits MNC code
2011-02-02 09:52:24 -08:00
Jean-Baptiste Queru
61b06be285
am 155b0ee0: Merge from open-source gingerbread
...
* commit '155b0ee0498cf863091f3f83a752eaaedf1257f8':
fix for supporting 3 digits MNC code
2011-02-02 09:48:52 -08:00
Jean-Baptiste Queru
8226140cca
Merge from gingerbread
...
Change-Id: Ifb3d42aa0f3772ca545f739df347eeb0ca7f58dd
2011-02-02 09:47:43 -08:00
Jean-Baptiste Queru
155b0ee049
Merge from open-source gingerbread
...
Change-Id: Iec6167bec8423e39dde053f23969c1c76e10a461
2011-02-02 09:45:32 -08:00
Jean-Baptiste Queru
049b172b48
Merge "fix for supporting 3 digits MNC code" into gingerbread
2011-02-02 09:44:16 -08:00