Commit Graph

32545 Commits

Author SHA1 Message Date
Wink Saville
f983682b36 Merge "Disconnect ApnContexts in INITING state when error." into honeycomb-LTE 2011-07-07 22:00:56 -07:00
Wink Saville
206637af68 Merge "No need to have BASE_DATA_CONNECTION_TRACKER start at 50000." into honeycomb-LTE 2011-07-07 14:39:23 -07:00
Scott Main
a307ced08a am 40afb97c: cherrypick Change-Id: I51ac719e414ac2794ff446d992bb946acb0fa896 docs: add button builder for android market apps
* commit '40afb97c3289cd3daae9a31f4829d660ba747d37':
  cherrypick Change-Id: I51ac719e414ac2794ff446d992bb946acb0fa896 docs: add button builder for android market apps
2011-07-07 10:13:44 -07:00
Scott Main
1c4d16f1bc am 77dfe217: cherrypick Change-Id: I2f4c79c5874835bd643b21f7a8ff3649ca27ecfb docs: update dashboards
* commit '77dfe2173e2970a6a662b7d9537715c81886185e':
  cherrypick Change-Id: I2f4c79c5874835bd643b21f7a8ff3649ca27ecfb docs: update dashboards
2011-07-07 10:10:29 -07:00
Wink Saville
8c05bdcdbc Merge "Reset FAILED ApnContext state to IDLE on data setup triggers" into honeycomb-LTE 2011-07-06 19:04:30 -07:00
Robert Ly
3e02d13040 am ad2724de: cherrypicking from hc-mr1 Change-Id: I4f4ccbd73db94070274d4e6195df38b19b2245b8
* commit 'ad2724de956955b0ddf95491f6cb378f54dafde5':
  cherrypicking from hc-mr1 Change-Id: I4f4ccbd73db94070274d4e6195df38b19b2245b8
2011-07-06 18:17:53 -07:00
Wink Saville
53fef10a0d Merge "Allow vril-dump to work on user builds" into honeycomb-LTE 2011-07-06 12:08:05 -07:00
Robert Ly
e5fc60cb24 am 205d1c34: cherrypicking tools and adt r12 relnotes from hc-mr1 Change-Id: I0ea492417581c062f6433e23345fe3fe398709c0
* commit '205d1c34e3289b05700e6caab718de169ad82b90':
  cherrypicking tools and adt r12 relnotes from hc-mr1 Change-Id: I0ea492417581c062f6433e23345fe3fe398709c0
2011-07-06 11:22:20 -07:00
Scott Main
b79ff7a6a9 am a6870450: cherrypick from Change-Id: I1f95ed281c3152a47d5a3c8b927ae2a23568ed1e docs: fix game controller trademarks
* commit 'a687045045157eab2dbf657bb085cb0af68d72f2':
  cherrypick from Change-Id: I1f95ed281c3152a47d5a3c8b927ae2a23568ed1e docs: fix game controller trademarks
2011-06-28 20:50:12 -07:00
Wink Saville
6fa3003e46 Merge "Data connection retry pattern could be broken by PDP sharing" into honeycomb-LTE 2011-06-27 19:54:27 -07:00
Dianne Hackborn
b542ca9d6f am 5db9ff97: Update final 13 API def.
* commit '5db9ff97aa8f36f330f41f5ae42467795ef075b8':
  Update final 13 API def.
2011-06-27 17:07:29 -07:00
Robert Ly
2263f5a736 am 81cbc294: Merge "docs: fixing new superscript for rs" into honeycomb-mr2
* commit '81cbc294ddb08c2bc08be9b2abbbcc7c19ec88d9':
  docs: fixing new superscript for rs
2011-06-27 11:49:30 -07:00
Robert Ly
ab2d681800 Merge "docs: fixing new superscript for rs" into honeycomb-mr2 2011-06-27 11:45:41 -07:00
Anirudh Dewani
5a30692bd9 am 1f82dc08: Merge "Typo in spinner tutorial." into honeycomb-mr2
* commit '1f82dc08f1616a83d8d1c43fa9ac16d0d60dd537':
  Typo in spinner tutorial.
2011-06-26 23:06:04 -07:00
Anirudh Dewani
1ff7546587 Merge "Typo in spinner tutorial." into honeycomb-mr2 2011-06-26 23:02:56 -07:00
Dianne Hackborn
9b29a8811f am 2dafe771: Merge "DO NOT MERGE. Fix density compat mode." into honeycomb-mr2
* commit '2dafe771bb7ad4b15db6b740fd3ccb8f0fae836d':
  DO NOT MERGE.  Fix density compat mode.
2011-06-24 12:26:17 -07:00
Dianne Hackborn
076958e943 Merge "DO NOT MERGE. Fix density compat mode." into honeycomb-mr2 2011-06-24 12:13:16 -07:00
Wink Saville
5976815f73 Merge "Temporary re-enabling iface name change handling on HO" into honeycomb-LTE 2011-06-23 18:21:36 -07:00
Scott Main
8c93cd9069 am f8d37ab6: Merge "docs: add emphasis to adding a search button in activity UI" into honeycomb-mr2
* commit 'f8d37ab6b35c6cdd44e833ae4bd65301f2d3543a':
  docs: add emphasis to adding a search button in activity UI
2011-06-23 13:12:30 -07:00
Scott Main
80b456bfa5 Merge "docs: add emphasis to adding a search button in activity UI" into honeycomb-mr2 2011-06-23 13:08:27 -07:00
Scott Main
5d79f944e8 am 9a05cfe5: docs: update docs for new screen support attributes and qualifiers
* commit '9a05cfe5427a6cee988333e0d65f17b9854554a3':
  docs: update docs for new screen support attributes and qualifiers
2011-06-23 12:26:33 -07:00
Scott Main
91ea42f381 am 1acd2a7f: Merge "docs: add Lenevo driver info" into honeycomb-mr2
* commit '1acd2a7f2b263e9d8de23a0d5630d77efe370c80':
  docs: add Lenevo driver info
2011-06-23 09:28:34 -07:00
Scott Main
d61c252269 Merge "docs: add Lenevo driver info" into honeycomb-mr2 2011-06-23 09:18:22 -07:00
Robert Greenwalt
c3dd145059 Merge "Restrict access to protected networks." into honeycomb-LTE 2011-06-23 08:04:48 -07:00
Scott Main
1a54e9271b am 138836ad: Merge "docs: add info about manifest attributes that should not change" into honeycomb-mr2
* commit '138836adc7e28e66984fdc20d22688d4da561c15':
  docs: add info about manifest attributes that should not change
2011-06-22 17:53:12 -07:00
Scott Main
68e715e258 Merge "docs: add info about manifest attributes that should not change" into honeycomb-mr2 2011-06-22 17:45:13 -07:00
Jerry J. Wang
bec296ff25 am 850aaaef: Merge "Don\'t throw exception for EGL_BAD_CURRENT_SURFACE (DO NOT MERGE)" into honeycomb-mr2
* commit '850aaaeff6df3c1c6e9cec5ae67225bb57728e0e':
  Don't throw exception for EGL_BAD_CURRENT_SURFACE (DO NOT MERGE)
2011-06-22 15:11:04 -07:00
Jerry J. Wang
1545d8e9e7 Merge "Don't throw exception for EGL_BAD_CURRENT_SURFACE (DO NOT MERGE)" into honeycomb-mr2 2011-06-22 15:08:25 -07:00
Scott Main
cb4cce0554 am 929cba13: docs: remove exclamation from media title
* commit '929cba1391432eb66329781c866c92a07d3f45ae':
  docs: remove exclamation from media title
2011-06-22 14:46:43 -07:00
Katie McCormick
6ac5448fbb am d4fac2c0: Doc change: updated TOC for Bluetooth CL.
* commit 'd4fac2c0263fda4b20f253edd594cf909e61eb4e':
  Doc change: updated TOC for Bluetooth CL.
2011-06-22 14:43:36 -07:00
Scott Main
546839085d am 24ef1aa6: Merge "docs: use new CSE to show results for all sites" into honeycomb-mr2
* commit '24ef1aa672cc15984df7cccc5115fdda3ac85f58':
  docs: use new CSE to show results for all sites
2011-06-22 14:26:10 -07:00
Scott Main
0996fc868c Merge "docs: use new CSE to show results for all sites" into honeycomb-mr2 2011-06-22 14:23:22 -07:00
Robert Ly
792984b36b am d60e1b5b: cherrypick from hc-mr1 Change-Id: I7553282b2f3268672f79d9d75d63ce23bcdf1bf5
* commit 'd60e1b5b9132c6dba912fd5b4f5d7e12fd816244':
  cherrypick from hc-mr1 Change-Id: I7553282b2f3268672f79d9d75d63ce23bcdf1bf5
2011-06-22 12:52:25 -07:00
Irfan Sheriff
edcd063cf2 am ecce539f: Merge "Release wakelock after use" into honeycomb-mr2
* commit 'ecce539f3d739fbf4b395639a485fddf51f688d6':
  Release wakelock after use
2011-06-22 11:10:26 -07:00
Bruno Oliveira
73cabce9fc am f5c62362: Merge "Rewriting "Audio and Video" section of Dev Guide." into honeycomb-mr2
* commit 'f5c6236289e9f8a7df6af0bea78887ba2cbf406e':
  Rewriting "Audio and Video" section of Dev Guide.
2011-06-22 11:10:24 -07:00
Irfan Sheriff
85bf5d709f am 41b35884: Revert "DO NOT MERGE Revert "Fix lease duration handling""
* commit '41b35884ff68a62f5fc8f65dcc26342d0889113d':
  Revert "DO NOT MERGE Revert "Fix lease duration handling""
2011-06-22 11:10:16 -07:00
Irfan Sheriff
441e007a70 resolved conflicts for merge of 914ed90f to honeycomb-LTE
Change-Id: I616b7ba5c27d0cc4247f5cce4303effe14658e1e
2011-06-22 11:01:16 -07:00
Irfan Sheriff
3788dc27dc Merge "resolved conflicts for merge of 267a6181 to honeycomb-LTE" into honeycomb-LTE 2011-06-22 07:27:39 -07:00
Irfan Sheriff
9d094bf504 resolved conflicts for merge of 267a6181 to honeycomb-LTE
Change-Id: I95d459c937f788ed15f178e85692e1c393bdaa04
2011-06-22 07:11:42 -07:00
Wink Saville
a8a57b2364 Merge "Use dataConnectionNotInUse to decide if a DC is free." into honeycomb-LTE 2011-06-21 19:32:36 -07:00
Wink Saville
021ad6cd78 Merge "Fix handling of unsol_data_state_change with PDP sharing scenario" into honeycomb-LTE 2011-06-21 19:32:25 -07:00
Wink Saville
7d043c9fa1 Merge "Return USIM IMSI as subscriber ID in case of CDMA-LTE mode" into honeycomb-LTE 2011-06-21 19:32:16 -07:00
Wink Saville
7958aa9286 Merge "Special retry back-off timer in call setup failure." into honeycomb-LTE 2011-06-21 19:32:05 -07:00
Irfan Sheriff
5867716fbd Merge "Release wakelock after use" into honeycomb-mr2 2011-06-21 19:17:27 -07:00
Bruno Oliveira
4a0501a75e Merge "Rewriting "Audio and Video" section of Dev Guide." into honeycomb-mr2 2011-06-21 16:44:56 -07:00
Irfan Sheriff
3912a86cf1 am bc4ddef4: Merge "DO NOT MERGE Revert "Fix lease duration handling"" into honeycomb-mr2
* commit 'bc4ddef479011e200d0273fe73c22922a85de1fe':
  DO NOT MERGE Revert "Fix lease duration handling"
2011-06-21 14:29:42 -07:00
Irfan Sheriff
a5eebbd1ca Merge "DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine"" into honeycomb-mr2 2011-06-21 14:23:17 -07:00
Irfan Sheriff
deab10e7ba Merge "DO NOT MERGE Revert "Fix lease duration handling"" into honeycomb-mr2 2011-06-21 14:23:09 -07:00
Bruno Oliveira
41ae13e9d1 am da61eab8: Merge "Integrating RandomMusicPlayer sample into tree." into honeycomb-mr2
* commit 'da61eab862dabe00f95c784a01c019e4f7776b23':
  Integrating RandomMusicPlayer sample into tree.
2011-06-21 11:11:18 -07:00
Bruno Oliveira
972cd2f323 Merge "Integrating RandomMusicPlayer sample into tree." into honeycomb-mr2 2011-06-21 11:07:47 -07:00