Dianne Hackborn
8fb929bcb1
Merge "Fixing possible race condition."
2011-02-06 09:06:35 -08:00
Kenny Root
4cb99b4ab6
am d2a99617: am c94a9998: Merge "JPtextinput: Dont break emoji characters when cutting strings."
...
* commit 'd2a996173e53e7b38ff9b703cc5986d9715508a1':
JPtextinput: Dont break emoji characters when cutting strings.
2011-02-04 16:12:14 -08:00
Kenny Root
78bee4871f
am c94a9998: Merge "JPtextinput: Dont break emoji characters when cutting strings."
...
* commit 'c94a99987d8a49ea599c22ffad0e61db591963e0':
JPtextinput: Dont break emoji characters when cutting strings.
2011-02-04 16:01:13 -08:00
Gilles Debunne
3716ff2ddd
am 893ac28f: Merge "Blinking runnable is created only if text is editable. DO NOT MERGE." into gingerbread
...
* commit '893ac28f75561061a8f334cbd4e47833d7fd7843':
Blinking runnable is created only if text is editable. DO NOT MERGE.
2011-02-04 15:50:15 -08:00
Gilles Debunne
973a0c5d67
am 8a6ba494: Merge "All runnable are stopped on detach. DO NOT MERGE." into gingerbread
...
* commit '8a6ba494a28702e68b0a8fbd8bac34335536a8f8':
All runnable are stopped on detach. DO NOT MERGE.
2011-02-04 15:50:12 -08:00
Gilles Debunne
86411d75b2
am 53841df2: Merge "SelectAllOnFocus shows a higlighted text. DO NOT MERGE." into gingerbread
...
* commit '53841df2a49bffa53ba3d1e4b0580f4f23a64dc3':
SelectAllOnFocus shows a higlighted text. DO NOT MERGE.
2011-02-04 15:49:56 -08:00
Gilles Debunne
35dc5f703a
Merge "Blinking runnable is created only if text is editable. DO NOT MERGE." into gingerbread
2011-02-04 15:46:15 -08:00
Gilles Debunne
83d390f8fc
Merge "All runnable are stopped on detach. DO NOT MERGE." into gingerbread
2011-02-04 15:46:11 -08:00
Gilles Debunne
ae4c508672
Merge "SelectAllOnFocus shows a higlighted text. DO NOT MERGE." into gingerbread
2011-02-04 15:46:06 -08:00
Kenny Root
9766fb35c8
Merge "JPtextinput: Dont break emoji characters when cutting strings."
2011-02-04 15:42:14 -08:00
Brad Fitzpatrick
43b65d6ebc
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
77c244ff48
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
ef22f460c6
Merge "Initialize resampling buffer per track."
2011-02-04 10:19:06 -08:00
Joe Onorato
55547bc360
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
51a2bdc437
Merge "Managed dialogs should run on the same thread as their activity." into gingerbread
2011-02-03 18:05:20 -08:00
Nick Pelly
87731c6145
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
344ff4b82c
Merge "Fix docs type that broke build." into gingerbread
2011-02-03 16:27:51 -08:00
Jean-Baptiste Queru
504d094ea2
am 6dbdcd55: am db71bda6: Merge from gingerbread
...
* commit '6dbdcd55905e50e533d0d3d9abf735275bca68b6':
2011-02-03 16:21:47 -08:00
Scott Main
996522b760
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
2dc7584ef9
am 630ac8df: Merge "NFC documentation overhaul." into gingerbread
...
* commit '630ac8df2478cd0d47a90b95fbb13b9de4ad58b1':
NFC documentation overhaul.
2011-02-03 15:55:53 -08:00
Scott Main
71d29541b4
Merge "cherrypick Change-Id: I6053e6f20045b0ecba4b964f9bfb87c3241d3a91 update dashboard" into gingerbread
2011-02-03 15:24:40 -08:00
Jean-Baptiste Queru
ca7167f2f6
am db71bda6: Merge from gingerbread
...
* commit 'db71bda6f696aff6047e6c26c32e0c08bf6851bc':
2011-02-03 15:24:24 -08:00
Nick Pelly
eef4bf96a1
Merge "NFC documentation overhaul." into gingerbread
2011-02-03 15:23:17 -08:00
Jean-Baptiste Queru
26ad216859
Merge from gingerbread
...
Change-Id: I6b895012db6b96666dc3257b1f2e430925981188
2011-02-03 14:25:38 -08:00
Jean-Baptiste Queru
317c7912d0
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
c9b062ecde
Merge from open-source gingerbread
...
Change-Id: I19c4ba36cf4f2ef518b55768360b0bff1a92a5ab
2011-02-03 14:05:23 -08:00
Jean-Baptiste Queru
81f81875bc
Merge "Fix the Multi-page SMS sending error to several receipents" into gingerbread
2011-02-03 14:02:59 -08:00
Jean-Baptiste Queru
09a49faead
am 375afcd5: am 4b8ad9ef: Merge from gingerbread
...
* commit '375afcd5d69f47c85960270bf51b83a2b768d446':
2011-02-03 13:32:08 -08:00
Jean-Baptiste Queru
70ca70dee2
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
9a0255c3c4
Merge from gingerbread
...
Change-Id: Id0509272ef8382fb0004f4d38bbba744e3487a8c
2011-02-03 13:17:49 -08:00
Jean-Baptiste Queru
3c988fc39c
Merge ee4c17ee from gingerbread
...
Change-Id: Ide109e517fb7610d60f31ba6aa99fe665b59d690
2011-02-03 13:03:53 -08:00
Jean-Baptiste Queru
60bcbd0eae
Merge from open-source gingerbread
...
Change-Id: I63e8abc1b8d6db05dfce178ae736d8d0586f6c52
2011-02-03 12:41:51 -08:00
Jean-Baptiste Queru
05e90f057a
Merge "Fix delivery report error with PENDING status in SMS" into gingerbread
2011-02-03 12:17:47 -08:00
Scott Main
d853f21786
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
cf30ff9ff3
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
a81c478037
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
eba0a98abd
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
Bill Gruber
22616680c7
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
599a6ea28d
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
Scott Main
7238bb6b1a
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
Irfan Sheriff
22e78eb934
resolved conflicts for merge of 0a4b3fd9 to gingerbread-plus-aosp
...
Change-Id: I294e6e843ae028377d19c1180e0d5e9aef52897c
2011-02-02 14:23:10 -08:00
Jean-Baptiste Queru
09a107d3d0
am 05059b5b: am 8226140c: Merge from gingerbread
...
* commit '05059b5b35ade5957b8dfbb21b09e318a94232ed':
2011-02-02 09:56:30 -08:00
Jean-Baptiste Queru
3c47c34dee
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
9aace938ce
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
12801c78e9
Merge from gingerbread
...
Change-Id: Ifb3d42aa0f3772ca545f739df347eeb0ca7f58dd
2011-02-02 09:47:43 -08:00
Jean-Baptiste Queru
907b884345
Merge from open-source gingerbread
...
Change-Id: Iec6167bec8423e39dde053f23969c1c76e10a461
2011-02-02 09:45:32 -08:00
Jean-Baptiste Queru
5e06b988ab
Merge "fix for supporting 3 digits MNC code" into gingerbread
2011-02-02 09:44:16 -08:00
Eric Laurent
8f1c3ec16c
am 3d4069a2: Allow TTY mode for GSM Phones
...
* commit '3d4069a2e0c1c23244ead88a177ec06a2ef7a7d1':
Allow TTY mode for GSM Phones
2011-02-02 08:28:25 -08:00
Jean-Baptiste Queru
d7fafcc661
am dbf09fee: am eb17d6f5: Merge "Don\'t crash zygote if webcore fails to load"
...
* commit 'dbf09feee0ba7210dadebbbb4cf7e7248f4ea634':
Don't crash zygote if webcore fails to load
2011-02-01 13:12:04 -08:00
Jean-Baptiste Queru
c399c46688
am eb17d6f5: Merge "Don\'t crash zygote if webcore fails to load"
...
* commit 'eb17d6f51a9776f02be84859b8980a6317abd27c':
Don't crash zygote if webcore fails to load
2011-02-01 13:02:19 -08:00