Commit Graph

32135 Commits

Author SHA1 Message Date
John Wang
45da60e99f am 5d6f1167: Merge "Make LinkProperties comparable." into honeycomb-LTE
* commit '5d6f1167039e22889545212ce18192460f9b503e':
  Make LinkProperties comparable.
2011-04-07 12:46:18 -07:00
John Wang
1a564a8b57 Merge "Make LinkProperties comparable." into honeycomb-LTE 2011-04-07 12:44:04 -07:00
Wink Saville
b2e5bb2b2b am add31091: Merge "Add a 4G icon for LTE." into honeycomb-LTE
* commit 'add31091785c3de8df1555163cca9ee9d22c9968':
  Add a 4G icon for LTE.
2011-04-07 09:37:06 -07:00
Wink Saville
8331a02477 Merge "Add a 4G icon for LTE." into honeycomb-LTE 2011-04-07 09:35:18 -07:00
Teng-Hui Zhu
c77a4c2bae am b3bb6fd5: am b25181aa: Merge "Fix the issue the video can\'t start to play" into honeycomb-mr1
* commit 'b3bb6fd5e3050b6d17bc1a58906ea04e97a29e20':
  Fix the issue the video can't start to play
2011-04-07 09:14:50 -07:00
Teng-Hui Zhu
ccd0789d9d am b25181aa: Merge "Fix the issue the video can\'t start to play" into honeycomb-mr1
* commit 'b25181aaccb00fee405251bf3575ce1d40badf46':
  Fix the issue the video can't start to play
2011-04-07 09:07:52 -07:00
Teng-Hui Zhu
decffc4e2f Merge "Fix the issue the video can't start to play" into honeycomb-mr1 2011-04-07 08:52:45 -07:00
Wink Saville
4228900c55 am 1b87f1db: Merge "Add getCdmaSubscriptionSource to CommandsInterface." into honeycomb-LTE
* commit '1b87f1db89e82d00445a43c4593d8c5ea5d2633f':
  Add getCdmaSubscriptionSource to CommandsInterface.
2011-04-06 17:54:11 -07:00
Wink Saville
089001ae89 Merge "Add getCdmaSubscriptionSource to CommandsInterface." into honeycomb-LTE 2011-04-06 17:52:22 -07:00
Roman Nurik
454871f386 am e2b81c3e: am b17cc8a8: Merge "Add moov/mdat and 500KB max A/V drift recommendations to Supported Media Formats doc. Also reformat encoding parameter recommendations into a single table." into honeycomb-mr1
* commit 'e2b81c3e886e47f00d54426ca82c66c6f56bc5b1':
  Add moov/mdat and 500KB max A/V drift recommendations to Supported Media Formats doc. Also reformat encoding parameter recommendations into a single table.
2011-04-06 17:25:08 -07:00
Roman Nurik
80f3f06f5d am b17cc8a8: Merge "Add moov/mdat and 500KB max A/V drift recommendations to Supported Media Formats doc. Also reformat encoding parameter recommendations into a single table." into honeycomb-mr1
* commit 'b17cc8a83fd819efcb79d78d005e16b3f04d08df':
  Add moov/mdat and 500KB max A/V drift recommendations to Supported Media Formats doc. Also reformat encoding parameter recommendations into a single table.
2011-04-06 17:21:21 -07:00
Roman Nurik
5bc3c5838a Merge "Add moov/mdat and 500KB max A/V drift recommendations to Supported Media Formats doc. Also reformat encoding parameter recommendations into a single table." into honeycomb-mr1 2011-04-06 17:18:47 -07:00
Eric Fischer
f68b3714a8 am ad3bddab: am 9f2f650f: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit 'ad3bddab9246933971ff1b5360b0915e55579fe7':
  Import revised translations.  DO NOT MERGE
2011-04-06 14:16:12 -07:00
Eric Fischer
b34190ad51 am 9f2f650f: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit '9f2f650f26941a7cd4931afc66f39918e7c2817c':
  Import revised translations.  DO NOT MERGE
2011-04-06 14:12:31 -07:00
Eric Fischer
e40981d31f Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-04-06 14:09:32 -07:00
Bill Gruber
cd5b479d7c am 2811358f: am 3bd37307: am 48a1b52b: Merge "IAB docs: fixes line break issues" into honeycomb
* commit '2811358f68e6f31c44f483e196f1c91692febf50':
  IAB docs: fixes line break issues
2011-04-06 14:04:47 -07:00
Bill Gruber
a177f16b19 am 3bd37307: am 48a1b52b: Merge "IAB docs: fixes line break issues" into honeycomb
* commit '3bd373079ed2599e5e07aa1cf702c7f8386765c3':
  IAB docs: fixes line break issues
2011-04-06 13:58:34 -07:00
Bill Gruber
f206d444f8 am 48a1b52b: Merge "IAB docs: fixes line break issues" into honeycomb
* commit '48a1b52bc736acfe9c4723abf6db7c8befc5e43b':
  IAB docs: fixes line break issues
2011-04-06 13:20:27 -07:00
Bill Gruber
19b7ed0865 Merge "IAB docs: fixes line break issues" into honeycomb 2011-04-06 12:52:41 -07:00
Xavier Ducrohet
cded00b270 am 73dc2602: am c5aeac7f: LayoutLib: Fix issue with rendering mode.
* commit '73dc2602898a300306ad418ca5bec990f0de877f':
  LayoutLib: Fix issue with rendering mode.
2011-04-06 12:50:01 -07:00
Xavier Ducrohet
16045d820f am c5aeac7f: LayoutLib: Fix issue with rendering mode.
* commit 'c5aeac7f157e3cb9e29ab8c126f74e26493501f5':
  LayoutLib: Fix issue with rendering mode.
2011-04-06 12:41:17 -07:00
Scott Main
27f58106ef am c70d483f: am e4cafabb: am a90eb8fe: docs: fix the TOC in a few docs
* commit 'c70d483f4baffe5cb4ba09df3645aa6a1b351431':
  docs: fix the TOC in a few docs
2011-04-05 14:32:15 -07:00
Scott Main
fc182c2c9a am e4cafabb: am a90eb8fe: docs: fix the TOC in a few docs
* commit 'e4cafabbcc4b69479217d1a167926b79c37e5ded':
  docs: fix the TOC in a few docs
2011-04-05 14:28:23 -07:00
Scott Main
3bf2275eec am a90eb8fe: docs: fix the TOC in a few docs
* commit 'a90eb8fec1c67177b614b945bcc4a4b14aaabaff':
  docs: fix the TOC in a few docs
2011-04-05 14:21:36 -07:00
Adam Powell
9fd2edebe8 am 2bb59637: am 030b38ff: Merge "Fix bug 4207704 - Gestures can be lost when Flash is enabled" into honeycomb-mr1
* commit '2bb59637caa71d7e05f7c94d3da425fbfd425ea7':
  Fix bug 4207704 - Gestures can be lost when Flash is enabled
2011-04-05 11:27:23 -07:00
Adam Powell
7ce2ea95e9 am 030b38ff: Merge "Fix bug 4207704 - Gestures can be lost when Flash is enabled" into honeycomb-mr1
* commit '030b38ffc21ef3962b31d5bac5170531293b6046':
  Fix bug 4207704 - Gestures can be lost when Flash is enabled
2011-04-05 11:14:27 -07:00
Adam Powell
78b135de42 Merge "Fix bug 4207704 - Gestures can be lost when Flash is enabled" into honeycomb-mr1 2011-04-05 10:45:25 -07:00
Eric Laurent
2c33e89577 am b7a76e84: am a482d83c: Merge "Issue 4157048: mic gain for VoIP/SIP calls." into gingerbread
* commit 'b7a76e84fde7fe534d46aaaa71e3224798354009':
  Issue 4157048: mic gain for VoIP/SIP calls.
2011-04-04 17:44:50 -07:00
Mike Lockwood
e26dbc56ce am 179122ad: (-s ours) am a8731e1e: Merge "DO NOT MERGE: UsbService: Make USB disconnect handling for accessory mode more robust" into gingerbread
* commit '179122ad56f12bd802fd29fe0b6606dd23ec5ba9':
  DO NOT MERGE: UsbService: Make USB disconnect handling for accessory mode more robust
2011-04-04 17:44:46 -07:00
Trevor Johns
b5ab4f3aa8 am ea477d20: am cafbe87d: Merge "Fixing line in Market IAB docs that explains how to bind to the MarketService." into gingerbread
* commit 'ea477d2043eeb8c20435f17b139bd5dd1248d763':
  Fixing line in Market IAB docs that explains how to bind to the MarketService.
2011-04-04 17:44:42 -07:00
Simon Wilson
8757f75762 am d7a8e845: (-s ours) am ec944728: Merge "DO NOT MERGE Disable WiMAX when "Data Enabled" is off" into gingerbread
* commit 'd7a8e8453d8302ac9820af49b4b112468efdf36d':
  DO NOT MERGE Disable WiMAX when "Data Enabled" is off
2011-04-04 17:44:38 -07:00
Bill Gruber
5baaac6fbb am f0d2c1c4: am 63ac0379: am d36bc32e: Merge "SDK doc updates" into honeycomb
* commit 'f0d2c1c4eb613130e34a4f377d8f82f935170873':
  SDK doc updates
2011-04-04 17:35:34 -07:00
Bill Gruber
fed3b263c6 am 63ac0379: am d36bc32e: Merge "SDK doc updates" into honeycomb
* commit '63ac03794df9ca383416c3a782812b9a9c03456d':
  SDK doc updates
2011-04-04 17:31:23 -07:00
Bill Gruber
24fe32e301 am d36bc32e: Merge "SDK doc updates" into honeycomb
* commit 'd36bc32ea9a109596308a0516b3e0898c82cebc5':
  SDK doc updates
2011-04-04 17:21:25 -07:00
Bill Gruber
6cba82c9da Merge "SDK doc updates" into honeycomb 2011-04-04 17:15:08 -07:00
Eric Fischer
ec180cff05 am d20023ae: (-s ours) am 8b312c6c: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit 'd20023ae44e611b104b58bc23aae6a42b219a503':
  Import revised translations.  DO NOT MERGE
2011-04-04 16:43:48 -07:00
Jason parks
a22e688842 am 1d733625: am cca2f2f9: Merge "Send out a broadcast that the system is being factory reset." into gingerbread
* commit '1d73362597c49f4692a580460bc8697a8f1d0efa':
  Send out a broadcast that the system is being factory reset.
2011-04-04 16:43:34 -07:00
Justin Ho
5d6b9f785d am 0f5e36de: am 87805ca3: Updated CDMA roaming icons
* commit '0f5e36deee14b9d21dcf8ca2986e63b38fa9354b':
  Updated CDMA roaming icons
2011-04-04 16:43:23 -07:00
Jean-Baptiste Queru
dc23f67c67 am 0c61e105: am bef31431: No-op - reconcile with open-source gingerbread
* commit '0c61e105906f96e5139beb8162c0ead8787faf7a':
2011-04-04 16:43:15 -07:00
Robert Greenwalt
e9e3d1dec2 resolved conflicts for merge of ab2194aa to honeycomb-plus-aosp
Change-Id: I99a29f920336b00b26b9aadafd2bd835049f48cf
2011-04-04 16:26:42 -07:00
Robert Greenwalt
9319fc55df am 37229514: Merge "resolved conflicts for merge of 7544b23e to gingerbread-plus-aosp" into gingerbread-plus-aosp
* commit '37229514c56dac0c1e3cef6bc8229232d0c75b96':
  Fix Default route after secondary net use.
2011-04-04 15:25:45 -07:00
Brad Fitzpatrick
bb58f515ba am 27e00544: am 9907d161: Merge "Fix data corruption when writing to Bluetooth socket"
* commit '27e00544ea08d25e8e9b1b94264205f9d53030fb':
  Fix data corruption when writing to Bluetooth socket
2011-04-04 15:25:39 -07:00
Brad Fitzpatrick
c52b5703d1 am 9b1b6439: am 2ed72048: Merge "Always return a valid index from Rfc822Tokenizer.findTokenEnd()"
* commit '9b1b64399502af0a08beac3014f2294644753602':
  Always return a valid index from Rfc822Tokenizer.findTokenEnd()
2011-04-04 15:25:33 -07:00
Brad Fitzpatrick
11f34d8880 am f7a34b15: am e558a000: Merge "Avoid crash in system server when mounting container"
* commit 'f7a34b15986f8c00bc6fb941a40f9acbe2c21aff':
  Avoid crash in system server when mounting container
2011-04-04 15:25:21 -07:00
Robert Greenwalt
7ed6fe4847 Merge "resolved conflicts for merge of 92d72ca0 to honeycomb-plus-aosp" into honeycomb-plus-aosp 2011-04-04 15:07:41 -07:00
Robert Greenwalt
98bf2c5d1e resolved conflicts for merge of 92d72ca0 to honeycomb-plus-aosp
Change-Id: Ide9ed301618b89a1cced4885062c13047980890c
2011-04-04 15:00:13 -07:00
Roman Nurik
5daa25e710 am 91315577: am 5a41a8a0: Merge "Document support for .TS video containers." into honeycomb-mr1
* commit '9131557721afc93626f0fcbbe6e485a0c863cc87':
  Document support for .TS video containers.
2011-04-04 13:47:34 -07:00
Roman Nurik
6c5baca5e1 am 5a41a8a0: Merge "Document support for .TS video containers." into honeycomb-mr1
* commit '5a41a8a0fda21d5332f1355832550fcfffbb9975':
  Document support for .TS video containers.
2011-04-04 13:44:23 -07:00
Roman Nurik
5438c1d944 Merge "Document support for .TS video containers." into honeycomb-mr1 2011-04-04 13:41:11 -07:00
Eric Laurent
c873feaefc am a482d83c: Merge "Issue 4157048: mic gain for VoIP/SIP calls." into gingerbread
* commit 'a482d83ccf35ccd6cc29a9e1ace3d77b5f28d013':
  Issue 4157048: mic gain for VoIP/SIP calls.
2011-04-04 12:25:37 -07:00