Commit Graph

32050 Commits

Author SHA1 Message Date
Wink Saville
8301d0fcb3 am 0b8e313c: Merge "Data Retry fix after failure due to permanent causes." into honeycomb-LTE
* commit '0b8e313c7f97f9cb34e2ba555182621889b69a16':
  Data Retry fix after failure due to permanent causes.
2011-04-01 16:36:25 -07:00
Wink Saville
6d01167df4 Merge "Data Retry fix after failure due to permanent causes." into honeycomb-LTE 2011-04-01 16:34:51 -07:00
Scott Main
753fdd692d am 0fa1d66c: am 6261861a: am cb719a48: Merge "docs: update homepage announcement for Google IO" into honeycomb
* commit '0fa1d66cccc6041bcc55cf39e77970edbe89109f':
  docs: update homepage announcement for Google IO
2011-04-01 16:25:14 -07:00
Scott Main
60d4f1268e am 6261861a: am cb719a48: Merge "docs: update homepage announcement for Google IO" into honeycomb
* commit '6261861a94448e4fbc26e313ce1410a184a10914':
  docs: update homepage announcement for Google IO
2011-04-01 16:22:35 -07:00
Scott Main
59a50e129b am cb719a48: Merge "docs: update homepage announcement for Google IO" into honeycomb
* commit 'cb719a48a2f2e9bc47b317f75ebb8320f6ce877c':
  docs: update homepage announcement for Google IO
2011-04-01 16:19:30 -07:00
Scott Main
ac8b122389 Merge "docs: update homepage announcement for Google IO" into honeycomb 2011-04-01 16:17:40 -07:00
Mike Lockwood
2983e3bb9e am 38f04c0f: am 11dd5ae9: Improve Javadoc for USB Manager and MTP/PTP support.
* commit '38f04c0f28fc59bc7e893ca6a1ffc4d0745ab8c2':
  Improve Javadoc for USB Manager and MTP/PTP support.
2011-04-01 11:37:05 -07:00
Mike Lockwood
d50605b686 am 11dd5ae9: Improve Javadoc for USB Manager and MTP/PTP support.
* commit '11dd5ae97b1cd5889bb66862fd12718da62a9c75':
  Improve Javadoc for USB Manager and MTP/PTP support.
2011-04-01 11:34:39 -07:00
Wink Saville
0586ba6e83 am dacb8090: Merge "Airplane mode on always timed out when camping on LTE" into honeycomb-LTE
* commit 'dacb80901dfbd7cc18a6f1ede6ca334ed42c038f':
  Airplane mode on always timed out when camping on LTE
2011-04-01 10:32:37 -07:00
Wink Saville
8ee9ebcbca am 0198fff9: Rename ro.telephony.lte_on_cdma to telephony.lte_on_cdma.
* commit '0198fff90430d9f974b0284fc3659434406c751b':
  Rename ro.telephony.lte_on_cdma to telephony.lte_on_cdma.
2011-04-01 10:30:44 -07:00
Wink Saville
ff47ce57ad Merge "Airplane mode on always timed out when camping on LTE" into honeycomb-LTE 2011-04-01 10:28:22 -07:00
Jean-Baptiste Queru
5b2138ab38 ignore from gingerbread-plus-aosp
Change-Id: I80fc76acaa18aae7b313bb19489f277ce4700368
2011-03-31 20:08:04 -07:00
Scott Main
eb81e071f0 am 77de14d6: am 1ccdc235: am e979332f: docs: fix markup bugs
* commit '77de14d64f1b2a36a117869d412a3a74e6823cd7':
  docs: fix markup bugs
2011-03-31 19:14:00 -07:00
Scott Main
b3d76339b0 am 1ccdc235: am e979332f: docs: fix markup bugs
* commit '1ccdc235716715e7c6f13cab42e4195454e04615':
  docs: fix markup bugs
2011-03-31 19:10:56 -07:00
Scott Main
5e4dcd6770 am e979332f: docs: fix markup bugs
* commit 'e979332f38e677db4c9d89f695352ed41052553d':
  docs: fix markup bugs
2011-03-31 19:06:33 -07:00
Russell Brenner
8bb4414e9f am 7b445dd7: am 49b49f8f: Added include/private/hwui/DrawGlInfo.h
* commit '7b445dd7c0814a39eaf912fa1a871f00d5190550':
  Added include/private/hwui/DrawGlInfo.h
2011-03-31 19:00:35 -07:00
Russell Brenner
7faee43a9d am c6b22e27: Updated JBQ\'s original SurfaceTexture stubs to make webkit MR1 buildable
* commit 'c6b22e2727bd3730edd5ad72831a9bb4670d00f3':
  Updated JBQ's original SurfaceTexture stubs to make webkit MR1 buildable
2011-03-31 18:55:26 -07:00
Russell Brenner
8fa06d3579 am 49b49f8f: Added include/private/hwui/DrawGlInfo.h
* commit '49b49f8fb6d094768d4e093353b34271f2da1bfc':
  Added include/private/hwui/DrawGlInfo.h
2011-03-31 18:55:20 -07:00
Russell Brenner
0686717d79 Updated JBQ's original SurfaceTexture stubs to make webkit MR1 buildable
Change-Id: If1c1610efcc0e0bc6de88c75712baed91624b1a7
2011-03-31 17:40:08 -07:00
Wink Saville
a83d4fca27 am b90f9c37: Merge "Telephony: Add Powerdown Cause to PDP Deactivate Message." into honeycomb-LTE
* commit 'b90f9c370e5b1b1825016e48b864e8eda6d5f89c':
  Telephony: Add Powerdown Cause to PDP Deactivate Message.
2011-03-31 15:52:58 -07:00
Wink Saville
9cf55844ef Merge "Telephony: Add Powerdown Cause to PDP Deactivate Message." into honeycomb-LTE 2011-03-31 15:51:07 -07:00
Wink Saville
cb528cf26a am 11feacb3: Merge "Telephony: Cleanup of SIM handling in CdmaLteSST." into honeycomb-LTE
* commit '11feacb348e624bcdbb073a32c1fc1d8bdc7bae3':
  Telephony: Cleanup of SIM handling in CdmaLteSST.
2011-03-31 13:19:06 -07:00
Wink Saville
51e9368cd5 Merge "Telephony: Cleanup of SIM handling in CdmaLteSST." into honeycomb-LTE 2011-03-31 13:16:41 -07:00
Glenn Kasten
0db86b97a0 am 4ed59de6: am ffa670b5: Bug 4167061
* commit '4ed59de640e46e42b5af3d79448be9da6e79667d':
  Bug 4167061
2011-03-31 11:08:52 -07:00
Glenn Kasten
bb150be680 am ffa670b5: Bug 4167061
* commit 'ffa670b5b00b8b4c5a4296f9a1ac382c0e647894':
  Bug 4167061
2011-03-31 11:06:41 -07:00
Robert Greenwalt
b1e4542e98 Merge "Fix the build." into honeycomb-plus-aosp 2011-03-31 10:47:32 -07:00
Wink Saville
154616f763 am b136aa6c: Merge "Telephony: Update LTE RILConstants to match ril.h" into honeycomb-LTE
* commit 'b136aa6c9a1c043ff91357cea9e0b6597c904507':
  Telephony: Update LTE RILConstants to match ril.h
2011-03-31 10:26:12 -07:00
Wink Saville
37a6515a76 Merge "Telephony: Update LTE RILConstants to match ril.h" into honeycomb-LTE 2011-03-31 10:23:11 -07:00
Dianne Hackborn
f98821724c am a5b308e7: am 53df89c7: Merge "Expand screen documentation with explicit screen size dimensions." into honeycomb-mr1
* commit 'a5b308e74c44722b9414fa9be52eabacd23029b2':
  Expand screen documentation with explicit screen size dimensions.
2011-03-30 17:53:44 -07:00
Dianne Hackborn
6d31dc83b4 am 53df89c7: Merge "Expand screen documentation with explicit screen size dimensions." into honeycomb-mr1
* commit '53df89c74fb3a31a874ad575467c5d498a53646e':
  Expand screen documentation with explicit screen size dimensions.
2011-03-30 17:50:29 -07:00
Dianne Hackborn
32005bd7c6 Merge "Expand screen documentation with explicit screen size dimensions." into honeycomb-mr1 2011-03-30 17:43:17 -07:00
Justin Ho
50ce790103 am 0b251aec: am 01b13a11: Merge "Replacing browser playback controls for inactive videos Bug: 4136024" into honeycomb-mr1
* commit '0b251aec4307d566ebb1a95f8b1136d6d5b8d5a6':
  Replacing browser playback controls for inactive videos Bug: 4136024
2011-03-30 16:00:50 -07:00
Justin Ho
667fe67ba0 am 01b13a11: Merge "Replacing browser playback controls for inactive videos Bug: 4136024" into honeycomb-mr1
* commit '01b13a11e6492ebba66c496eaefdb008f2638870':
  Replacing browser playback controls for inactive videos Bug: 4136024
2011-03-30 15:59:19 -07:00
Justin Ho
cf98fbf9ce Merge "Replacing browser playback controls for inactive videos Bug: 4136024" into honeycomb-mr1 2011-03-30 15:57:42 -07:00
Trevor Johns
5ee2e9289c am f829305f: am e1cc88cc: am eb344a69: Fixing line in Market IAB docs that explains how to bind to the MarketService.
* commit 'f829305f8706e32fa103e5ee9eef7c595642d1a2':
  Fixing line in Market IAB docs that explains how to bind to the MarketService.
2011-03-30 15:30:56 -07:00
Trevor Johns
6fb9cf809b am e1cc88cc: am eb344a69: Fixing line in Market IAB docs that explains how to bind to the MarketService.
* commit 'e1cc88ccaf5fec2671c2f50bd850e7c56b03f286':
  Fixing line in Market IAB docs that explains how to bind to the MarketService.
2011-03-30 15:29:10 -07:00
Trevor Johns
25844ed7ea am eb344a69: Fixing line in Market IAB docs that explains how to bind to the MarketService.
* commit 'eb344a69fa728c010425fb1e18fc8f5774693986':
  Fixing line in Market IAB docs that explains how to bind to the MarketService.
2011-03-30 15:26:38 -07:00
Andreas Huber
c3fdf9b816 am 06ac0399: am b676b73e: Merge "When http streaming and Content-Length is unknown, make sure to return all" into honeycomb-mr1
* commit '06ac039962c7f15938afc4bbb74c2f14de4dc505':
  When http streaming and Content-Length is unknown, make sure to return all
2011-03-30 15:22:57 -07:00
Andreas Huber
0a398b8fe3 am b676b73e: Merge "When http streaming and Content-Length is unknown, make sure to return all" into honeycomb-mr1
* commit 'b676b73e391b10a4ec5fbd6a1a02054fb3d8aa4b':
  When http streaming and Content-Length is unknown, make sure to return all
2011-03-30 15:19:46 -07:00
Jeff Hamilton
37aaa96f40 am b9896794: am 96cf34d3: Merge "Make STOP_APP_SWITCHES signatureOrSystem." into gingerbread
* commit 'b98967942e9a764b80abc8ff1c6f6f2d620c0f7a':
  Make STOP_APP_SWITCHES signatureOrSystem.
2011-03-30 15:18:30 -07:00
Irfan Sheriff
b57cb5bfb7 am 11ebb6f5: (-s ours) am 05f14e2b: Merge "DO NOT MERGE Pick upstream intf with valid IP conf" into gingerbread
* commit '11ebb6f5020761b9b8373a5e0d777fb91a2b92c2':
  DO NOT MERGE Pick upstream intf with valid IP conf
2011-03-30 15:18:23 -07:00
Andreas Huber
b08b9e8ef5 Merge "When http streaming and Content-Length is unknown, make sure to return all" into honeycomb-mr1 2011-03-30 15:16:36 -07:00
Robert Greenwalt
8be27ca06c Merge "resolved conflicts for merge of ce6766ea to honeycomb-plus-aosp" into honeycomb-plus-aosp 2011-03-30 15:08:27 -07:00
Robert Greenwalt
6799c31658 resolved conflicts for merge of ce6766ea to honeycomb-plus-aosp
Change-Id: I4c3c382cc5cd89f8a4437cf17836fb42f9417ee1
2011-03-30 15:03:13 -07:00
Eric Fischer
8f301a19e6 am acf48255: am 91c482b2: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit 'acf48255aa3706489839948f153615e5c5cf38cb':
  Import revised translations.  DO NOT MERGE
2011-03-30 14:46:44 -07:00
Eric Fischer
fc30ab2fd8 am 91c482b2: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit '91c482b2351db1221308fe90800b8ef8bddbed90':
  Import revised translations.  DO NOT MERGE
2011-03-30 14:42:30 -07:00
Eric Fischer
5cdc24e380 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-03-30 14:39:25 -07:00
Scott Main
445b70f4eb am 5c35c059: am 5b68c655: Merge "docs: update makefile to show javadocs diffs for api level 12" into honeycomb-mr1
* commit '5c35c05909640768bbe7f1ecef3165382825c31b':
  docs: update makefile to show javadocs diffs for api level 12
2011-03-30 12:13:59 -07:00
Scott Main
9742d26c3f am 5b68c655: Merge "docs: update makefile to show javadocs diffs for api level 12" into honeycomb-mr1
* commit '5b68c655a1f56dce1ffd6f175e991dd542d415cf':
  docs: update makefile to show javadocs diffs for api level 12
2011-03-30 12:12:15 -07:00
Scott Main
d3f76e9527 Merge "docs: update makefile to show javadocs diffs for api level 12" into honeycomb-mr1 2011-03-30 12:10:13 -07:00