OSDN Git Service
John Wang [Wed, 13 Jul 2011 17:17:22 +0000 (10:17 -0700)]
Merge "Add getImei() to Phone interface." into honeycomb-LTE
Scott Main [Mon, 11 Jul 2011 23:06:25 +0000 (16:06 -0700)]
am
e32c49ab: docs: de-new sidenavs
* commit '
e32c49ab2c5d6b347b39635a0202d7dbdc1f0769':
docs: de-new sidenavs
Robert Ly [Mon, 11 Jul 2011 23:03:30 +0000 (16:03 -0700)]
am
10a36020: cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba24e342f230b4a47fd786ba66a
* commit '
10a36020e3d37ef088f5f7ed6d64ba35847fc069':
cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba24e342f230b4a47fd786ba66a
Scott Main [Mon, 11 Jul 2011 22:50:16 +0000 (15:50 -0700)]
am
d3fa7bd1: docs: fix date on opengl dashboard
* commit '
d3fa7bd1e873d885f00b11bb8123284357ccd362':
docs: fix date on opengl dashboard
Xavier Ducrohet [Mon, 11 Jul 2011 19:43:15 +0000 (12:43 -0700)]
Chia-chi Yeh [Mon, 11 Jul 2011 17:25:28 +0000 (10:25 -0700)]
Merge "VpnService: stop VPN when unknown DNS servers show up." into honeycomb-LTE
Wink Saville [Mon, 11 Jul 2011 02:33:54 +0000 (19:33 -0700)]
Merge "Add a property so that CSIM provision check can be bypassed" into honeycomb-LTE
Chia-chi Yeh [Sat, 9 Jul 2011 00:59:54 +0000 (17:59 -0700)]
VpnService: stop VPN when unknown DNS servers show up.
Bug:
5002601
Change-Id: I5459db009e7391ff874623cb1830065ac75c80ed
Robert Ly [Fri, 8 Jul 2011 17:39:46 +0000 (10:39 -0700)]
am
3f3b8cbf: Merge "cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052" into honeycomb-mr2
* commit '
3f3b8cbfa775f2ebff985c069300f8daaeb7a84c':
cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052
Robert Ly [Fri, 8 Jul 2011 17:13:28 +0000 (10:13 -0700)]
Merge "cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052" into honeycomb-mr2
Joe Malin [Fri, 8 Jul 2011 16:39:25 +0000 (09:39 -0700)]
am
0e89d916: Merge "DOC CHANGE: Change GTV info on intro page" into honeycomb-mr2
* commit '
0e89d916f078a518093c476725fa7e0798dcc590':
DOC CHANGE: Change GTV info on intro page
Joe Fernandez [Fri, 8 Jul 2011 16:39:22 +0000 (09:39 -0700)]
am
0fbe1dfb: Merge "cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c" into honeycomb-mr2
* commit '
0fbe1dfb8df94a51d79e9a42fcbaebed6f6e516e':
cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c
Wink Saville [Fri, 8 Jul 2011 05:00:56 +0000 (22:00 -0700)]
Merge "Disconnect ApnContexts in INITING state when error." into honeycomb-LTE
Joe Malin [Fri, 8 Jul 2011 01:19:18 +0000 (18:19 -0700)]
Merge "DOC CHANGE: Change GTV info on intro page" into honeycomb-mr2
Joe Fernandez [Thu, 7 Jul 2011 22:03:55 +0000 (15:03 -0700)]
Merge "cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c" into honeycomb-mr2
Wink Saville [Thu, 7 Jul 2011 21:39:23 +0000 (14:39 -0700)]
Merge "No need to have BASE_DATA_CONNECTION_TRACKER start at 50000." into honeycomb-LTE
Scott Main [Thu, 7 Jul 2011 17:13:44 +0000 (10:13 -0700)]
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
Scott Main [Thu, 7 Jul 2011 17:10:29 +0000 (10:10 -0700)]
am
77dfe217: cherrypick Change-Id: I2f4c79c5874835bd643b21f7a8ff3649ca27ecfb docs: update dashboards
* commit '
77dfe2173e2970a6a662b7d9537715c81886185e':
cherrypick Change-Id: I2f4c79c5874835bd643b21f7a8ff3649ca27ecfb docs: update dashboards
Wink Saville [Thu, 7 Jul 2011 02:04:30 +0000 (19:04 -0700)]
Merge "Reset FAILED ApnContext state to IDLE on data setup triggers" into honeycomb-LTE
Robert Ly [Thu, 7 Jul 2011 01:17:53 +0000 (18:17 -0700)]
am
ad2724de: cherrypicking from hc-mr1 Change-Id: I4f4ccbd73db94070274d4e6195df38b19b2245b8
* commit '
ad2724de956955b0ddf95491f6cb378f54dafde5':
cherrypicking from hc-mr1 Change-Id: I4f4ccbd73db94070274d4e6195df38b19b2245b8
Wink Saville [Wed, 6 Jul 2011 19:08:05 +0000 (12:08 -0700)]
Merge "Allow vril-dump to work on user builds" into honeycomb-LTE
Robert Ly [Wed, 6 Jul 2011 18:22:20 +0000 (11:22 -0700)]
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
Scott Main [Wed, 29 Jun 2011 03:50:12 +0000 (20:50 -0700)]
am
a6870450: cherrypick from Change-Id: I1f95ed281c3152a47d5a3c8b927ae2a23568ed1e docs: fix game controller trademarks
* commit '
a687045045157eab2dbf657bb085cb0af68d72f2':
cherrypick from Change-Id: I1f95ed281c3152a47d5a3c8b927ae2a23568ed1e docs: fix game controller trademarks
Wink Saville [Tue, 28 Jun 2011 02:54:27 +0000 (19:54 -0700)]
Merge "Data connection retry pattern could be broken by PDP sharing" into honeycomb-LTE
Dianne Hackborn [Tue, 28 Jun 2011 00:07:29 +0000 (17:07 -0700)]
am
5db9ff97: Update final 13 API def.
* commit '
5db9ff97aa8f36f330f41f5ae42467795ef075b8':
Update final 13 API def.
Robert Ly [Mon, 27 Jun 2011 18:49:30 +0000 (11:49 -0700)]
am
81cbc294: Merge "docs: fixing new superscript for rs" into honeycomb-mr2
* commit '
81cbc294ddb08c2bc08be9b2abbbcc7c19ec88d9':
docs: fixing new superscript for rs
Robert Ly [Mon, 27 Jun 2011 18:45:41 +0000 (11:45 -0700)]
Merge "docs: fixing new superscript for rs" into honeycomb-mr2
Anirudh Dewani [Mon, 27 Jun 2011 06:06:04 +0000 (23:06 -0700)]
am
1f82dc08: Merge "Typo in spinner tutorial." into honeycomb-mr2
* commit '
1f82dc08f1616a83d8d1c43fa9ac16d0d60dd537':
Typo in spinner tutorial.
Anirudh Dewani [Mon, 27 Jun 2011 06:02:56 +0000 (23:02 -0700)]
Merge "Typo in spinner tutorial." into honeycomb-mr2
Dianne Hackborn [Fri, 24 Jun 2011 19:26:17 +0000 (12:26 -0700)]
am
2dafe771: Merge "DO NOT MERGE. Fix density compat mode." into honeycomb-mr2
* commit '
2dafe771bb7ad4b15db6b740fd3ccb8f0fae836d':
DO NOT MERGE. Fix density compat mode.
Dianne Hackborn [Fri, 24 Jun 2011 19:13:16 +0000 (12:13 -0700)]
Merge "DO NOT MERGE. Fix density compat mode." into honeycomb-mr2
Wink Saville [Fri, 24 Jun 2011 01:21:36 +0000 (18:21 -0700)]
Merge "Temporary re-enabling iface name change handling on HO" into honeycomb-LTE
Scott Main [Thu, 23 Jun 2011 20:12:30 +0000 (13:12 -0700)]
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
Scott Main [Thu, 23 Jun 2011 20:08:27 +0000 (13:08 -0700)]
Merge "docs: add emphasis to adding a search button in activity UI" into honeycomb-mr2
Scott Main [Thu, 23 Jun 2011 19:26:33 +0000 (12:26 -0700)]
am
9a05cfe5: docs: update docs for new screen support attributes and qualifiers
* commit '
9a05cfe5427a6cee988333e0d65f17b9854554a3':
docs: update docs for new screen support attributes and qualifiers
Scott Main [Thu, 23 Jun 2011 16:28:34 +0000 (09:28 -0700)]
am
1acd2a7f: Merge "docs: add Lenevo driver info" into honeycomb-mr2
* commit '
1acd2a7f2b263e9d8de23a0d5630d77efe370c80':
docs: add Lenevo driver info
Scott Main [Thu, 23 Jun 2011 16:18:22 +0000 (09:18 -0700)]
Merge "docs: add Lenevo driver info" into honeycomb-mr2
Robert Greenwalt [Thu, 23 Jun 2011 15:04:48 +0000 (08:04 -0700)]
Merge "Restrict access to protected networks." into honeycomb-LTE
Scott Main [Thu, 23 Jun 2011 00:53:12 +0000 (17:53 -0700)]
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
Scott Main [Thu, 23 Jun 2011 00:45:13 +0000 (17:45 -0700)]
Merge "docs: add info about manifest attributes that should not change" into honeycomb-mr2
Jerry J. Wang [Wed, 22 Jun 2011 22:11:04 +0000 (15:11 -0700)]
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)
Jerry J. Wang [Wed, 22 Jun 2011 22:08:25 +0000 (15:08 -0700)]
Merge "Don't throw exception for EGL_BAD_CURRENT_SURFACE (DO NOT MERGE)" into honeycomb-mr2
Scott Main [Wed, 22 Jun 2011 21:46:43 +0000 (14:46 -0700)]
am
929cba13: docs: remove exclamation from media title
* commit '
929cba1391432eb66329781c866c92a07d3f45ae':
docs: remove exclamation from media title
Katie McCormick [Wed, 22 Jun 2011 21:43:36 +0000 (14:43 -0700)]
am
d4fac2c0: Doc change: updated TOC for Bluetooth CL.
* commit '
d4fac2c0263fda4b20f253edd594cf909e61eb4e':
Doc change: updated TOC for Bluetooth CL.
Scott Main [Wed, 22 Jun 2011 21:26:10 +0000 (14:26 -0700)]
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
Scott Main [Wed, 22 Jun 2011 21:23:22 +0000 (14:23 -0700)]
Merge "docs: use new CSE to show results for all sites" into honeycomb-mr2
Robert Ly [Wed, 22 Jun 2011 19:52:25 +0000 (12:52 -0700)]
am
d60e1b5b: cherrypick from hc-mr1 Change-Id: I7553282b2f3268672f79d9d75d63ce23bcdf1bf5
* commit '
d60e1b5b9132c6dba912fd5b4f5d7e12fd816244':
cherrypick from hc-mr1 Change-Id: I7553282b2f3268672f79d9d75d63ce23bcdf1bf5
Irfan Sheriff [Wed, 22 Jun 2011 18:10:26 +0000 (11:10 -0700)]
am
ecce539f: Merge "Release wakelock after use" into honeycomb-mr2
* commit '
ecce539f3d739fbf4b395639a485fddf51f688d6':
Release wakelock after use
Bruno Oliveira [Wed, 22 Jun 2011 18:10:24 +0000 (11:10 -0700)]
am
f5c62362: Merge "Rewriting "Audio and Video" section of Dev Guide." into honeycomb-mr2
* commit '
f5c6236289e9f8a7df6af0bea78887ba2cbf406e':
Rewriting "Audio and Video" section of Dev Guide.
Irfan Sheriff [Wed, 22 Jun 2011 18:10:16 +0000 (11:10 -0700)]
am
41b35884: Revert "DO NOT MERGE Revert "Fix lease duration handling""
* commit '
41b35884ff68a62f5fc8f65dcc26342d0889113d':
Revert "DO NOT MERGE Revert "Fix lease duration handling""
Irfan Sheriff [Wed, 22 Jun 2011 18:01:16 +0000 (11:01 -0700)]
resolved conflicts for merge of
914ed90f to honeycomb-LTE
Change-Id: I616b7ba5c27d0cc4247f5cce4303effe14658e1e
Irfan Sheriff [Wed, 22 Jun 2011 14:27:39 +0000 (07:27 -0700)]
Merge "resolved conflicts for merge of
267a6181 to honeycomb-LTE" into honeycomb-LTE
Irfan Sheriff [Wed, 22 Jun 2011 05:46:51 +0000 (22:46 -0700)]
resolved conflicts for merge of
267a6181 to honeycomb-LTE
Change-Id: I95d459c937f788ed15f178e85692e1c393bdaa04
Wink Saville [Wed, 22 Jun 2011 02:32:36 +0000 (19:32 -0700)]
Merge "Use dataConnectionNotInUse to decide if a DC is free." into honeycomb-LTE
Wink Saville [Wed, 22 Jun 2011 02:32:25 +0000 (19:32 -0700)]
Merge "Fix handling of unsol_data_state_change with PDP sharing scenario" into honeycomb-LTE
Wink Saville [Wed, 22 Jun 2011 02:32:16 +0000 (19:32 -0700)]
Merge "Return USIM IMSI as subscriber ID in case of CDMA-LTE mode" into honeycomb-LTE
Wink Saville [Wed, 22 Jun 2011 02:32:05 +0000 (19:32 -0700)]
Merge "Special retry back-off timer in call setup failure." into honeycomb-LTE
Irfan Sheriff [Wed, 22 Jun 2011 02:17:27 +0000 (19:17 -0700)]
Merge "Release wakelock after use" into honeycomb-mr2
Bruno Oliveira [Tue, 21 Jun 2011 23:44:56 +0000 (16:44 -0700)]
Merge "Rewriting "Audio and Video" section of Dev Guide." into honeycomb-mr2
Irfan Sheriff [Tue, 21 Jun 2011 21:29:42 +0000 (14:29 -0700)]
am
bc4ddef4: Merge "DO NOT MERGE Revert "Fix lease duration handling"" into honeycomb-mr2
* commit '
bc4ddef479011e200d0273fe73c22922a85de1fe':
DO NOT MERGE Revert "Fix lease duration handling"
Irfan Sheriff [Tue, 21 Jun 2011 21:23:17 +0000 (14:23 -0700)]
Merge "DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine"" into honeycomb-mr2
Irfan Sheriff [Tue, 21 Jun 2011 21:23:09 +0000 (14:23 -0700)]
Merge "DO NOT MERGE Revert "Fix lease duration handling"" into honeycomb-mr2
Bruno Oliveira [Tue, 21 Jun 2011 18:11:18 +0000 (11:11 -0700)]
am
da61eab8: Merge "Integrating RandomMusicPlayer sample into tree." into honeycomb-mr2
* commit '
da61eab862dabe00f95c784a01c019e4f7776b23':
Integrating RandomMusicPlayer sample into tree.
Bruno Oliveira [Tue, 21 Jun 2011 18:07:47 +0000 (11:07 -0700)]
Merge "Integrating RandomMusicPlayer sample into tree." into honeycomb-mr2
Scott Main [Tue, 21 Jun 2011 17:31:09 +0000 (10:31 -0700)]
am
04295266: add api level 13 flag for docs
* commit '
04295266b03f3c588b8be6b6be409d59f757b27b':
add api level 13 flag for docs
Daniel Sandler [Tue, 21 Jun 2011 00:30:38 +0000 (17:30 -0700)]
am
444336dd: Merge "Fix crazy notification panel background." into honeycomb-mr2
* commit '
444336dd5f233c59e5a222d366d2498c888664b5':
Fix crazy notification panel background.
Daniel Sandler [Tue, 21 Jun 2011 00:29:24 +0000 (17:29 -0700)]
Merge "Fix crazy notification panel background." into honeycomb-mr2
Scott Main [Tue, 21 Jun 2011 00:28:41 +0000 (17:28 -0700)]
am
bb64fa1e: docs: fix a couple typos
* commit '
bb64fa1e3dde8910397d159eaa300c4444b0073c':
docs: fix a couple typos
Scott Main [Tue, 21 Jun 2011 00:26:48 +0000 (17:26 -0700)]
am
beeb7762: docs: fix broken link
* commit '
beeb776209446ea45252af5bbc1fe8a463b2001b':
docs: fix broken link
Robert Greenwalt [Mon, 20 Jun 2011 18:47:49 +0000 (11:47 -0700)]
Merge "Fix tethering upstream determination." into honeycomb-LTE
Robert Ly [Mon, 20 Jun 2011 16:44:59 +0000 (09:44 -0700)]
am
c7c1ba50: Merge "cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" into honeycomb-mr2
* commit '
c7c1ba5071456a813abbdadfdbe94287b06877e7':
cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7
Robert Ly [Mon, 20 Jun 2011 16:44:55 +0000 (09:44 -0700)]
am
329e0b90: Merge "cherrypick from hc-mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb" into honeycomb-mr2
* commit '
329e0b9020f3b8cd1265c265cdf00b438960cbe1':
cherrypick from hc-mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb
Robert Ly [Mon, 20 Jun 2011 16:37:51 +0000 (09:37 -0700)]
Merge "cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" into honeycomb-mr2
Robert Ly [Mon, 20 Jun 2011 16:37:36 +0000 (09:37 -0700)]
Merge "cherrypick from hc-mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb" into honeycomb-mr2
Mathias Agopian [Fri, 17 Jun 2011 01:09:56 +0000 (18:09 -0700)]
am
e7d3ee9d: Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)
* commit '
e7d3ee9d81de13e992c7d063ca472d480956b0c6':
Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)
Mathias Agopian [Fri, 17 Jun 2011 00:15:51 +0000 (17:15 -0700)]
Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)
Also revert all dependent changes:
This reverts commit
8e18668d14adf601cbe5973030c310ec23d88461.
This reverts commit
69b4587bfbb3e98f793959d9123340360fa233a2.
This reverts commit
a9c9a4baf24700e8817d47d8ea8da1742caea0b5.
This reverts commit
2c0042b666a969091c931614f2fc0dce2f1cfac8.
This reverts commit
f6c8206735e7e078461e5f2aef6e1a1446fdd075.
This reverts commit
24855c09173a6caaec7dcedd0c2d7ce15121d39b.
Change-Id: I33e699640f3f59e42fa03c99a9a1b7af0d27d4d8
John Wang [Thu, 16 Jun 2011 23:50:05 +0000 (16:50 -0700)]
am
c826f92e: Merge "Revert "Do not merge. Return null id for Non-phone device."" into honeycomb-mr2
* commit '
c826f92e6f90f4157afd4ed69c6907ff768a0d6b':
Revert "Do not merge. Return null id for Non-phone device."
John Wang [Thu, 16 Jun 2011 23:47:18 +0000 (16:47 -0700)]
Merge "Revert "Do not merge. Return null id for Non-phone device."" into honeycomb-mr2
Dianne Hackborn [Thu, 16 Jun 2011 22:22:10 +0000 (15:22 -0700)]
am
2f04883f: SDK only: integrate new sample code, deprecating along the way.
* commit '
2f04883ff880966d63d1aa4a1c7b05e497cfcc58':
SDK only: integrate new sample code, deprecating along the way.
Dianne Hackborn [Thu, 16 Jun 2011 21:49:08 +0000 (14:49 -0700)]
am
abd4dffc: Merge "New orientation handling. Only impacts SDK (aapt dump badging)." into honeycomb-mr2
* commit '
abd4dffc86202d48e50bd21807574fa861854dca':
New orientation handling. Only impacts SDK (aapt dump badging).
Dianne Hackborn [Thu, 16 Jun 2011 21:47:53 +0000 (14:47 -0700)]
Merge "New orientation handling. Only impacts SDK (aapt dump badging)." into honeycomb-mr2
Robert Greenwalt [Thu, 16 Jun 2011 21:44:57 +0000 (14:44 -0700)]
am
6b93f976: Merge "DO NOT MERGE" into honeycomb-mr2
* commit '
6b93f976c0cec32be39b3a17ea8195c4ac6b8052':
DO NOT MERGE
Robert Greenwalt [Thu, 16 Jun 2011 21:40:25 +0000 (14:40 -0700)]
Merge "DO NOT MERGE" into honeycomb-mr2
Xavier Ducrohet [Thu, 16 Jun 2011 20:39:31 +0000 (13:39 -0700)]
am
04ce8111: Bring in more layout lib changes from hc-mr1.
* commit '
04ce81113107d2bfa0b8248b13145b4cf24cb943':
Bring in more layout lib changes from hc-mr1.
Robert Greenwalt [Thu, 16 Jun 2011 18:34:03 +0000 (11:34 -0700)]
Merge "Reset connections AFTER we take down the network." into honeycomb-LTE
John Wang [Thu, 16 Jun 2011 18:22:53 +0000 (11:22 -0700)]
Merge "Support SIM permanently disabled state." into honeycomb-LTE
Mathias Agopian [Thu, 16 Jun 2011 05:40:07 +0000 (22:40 -0700)]
am
8e18668d: revert surfaceflinger leak fix as it uncovered a crasher on xoom (DO NOT MERGE)
* commit '
8e18668d14adf601cbe5973030c310ec23d88461':
revert surfaceflinger leak fix as it uncovered a crasher on xoom (DO NOT MERGE)
Mathias Agopian [Thu, 16 Jun 2011 05:09:39 +0000 (22:09 -0700)]
am
52a43990: Revert "revert surfaceflinger leak fix as it uncovered a crasher on xoom"
* commit '
52a43990880b27808bcf562afcc4209d34728e6e':
Revert "revert surfaceflinger leak fix as it uncovered a crasher on xoom"
Mathias Agopian [Thu, 16 Jun 2011 03:42:47 +0000 (20:42 -0700)]
revert surfaceflinger leak fix as it uncovered a crasher on xoom (DO NOT MERGE)
This reverts commit
52a43990880b27808bcf562afcc4209d34728e6e.
Change-Id: I1856a48f863b051395b8091ddfd1e01292fa1b1e
Mathias Agopian [Thu, 16 Jun 2011 03:41:24 +0000 (20:41 -0700)]
Revert "revert surfaceflinger leak fix as it uncovered a crasher on xoom"
This reverts commit
af6edba59e250adbdfa5b3c3be134f70d8c38a16.
Change-Id: I7793d3ca8a4d20a2b188364f47854328ab5f586d
Mathias Agopian [Thu, 16 Jun 2011 03:18:24 +0000 (20:18 -0700)]
am
d20d72d1: Merge "revert surfaceflinger leak fix as it uncovered a crasher on xoom" into honeycomb-mr2
* commit '
d20d72d193ab0d7f33c839d8bf9573b55abfebdc':
revert surfaceflinger leak fix as it uncovered a crasher on xoom
Mathias Agopian [Thu, 16 Jun 2011 03:16:15 +0000 (20:16 -0700)]
Merge "revert surfaceflinger leak fix as it uncovered a crasher on xoom" into honeycomb-mr2
Mathias Agopian [Thu, 16 Jun 2011 02:20:52 +0000 (19:20 -0700)]
revert surfaceflinger leak fix as it uncovered a crasher on xoom
Bug:
4600244
Change-Id: Ia68ebf0f243a051ff6a21b3863e3e5d259bbf7ac
Dianne Hackborn [Thu, 16 Jun 2011 00:10:33 +0000 (17:10 -0700)]
am
70921d61: Merge "We must keep up with the Joneses." into honeycomb-mr2
* commit '
70921d615496c5be8a19cbd1454378bb7d0201f3':
We must keep up with the Joneses.
Dianne Hackborn [Thu, 16 Jun 2011 00:08:04 +0000 (17:08 -0700)]
Merge "We must keep up with the Joneses." into honeycomb-mr2
Eric Fischer [Wed, 15 Jun 2011 23:41:44 +0000 (16:41 -0700)]
am
5e451faa: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
* commit '
5e451faa0c22e943fb76d812f699d51fa11c5495':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 15 Jun 2011 23:38:43 +0000 (16:38 -0700)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
Justin Ho [Wed, 15 Jun 2011 21:56:03 +0000 (14:56 -0700)]
am
f4096041: Merge "Updated art for compat mode dialog." into honeycomb-mr2
* commit '
f409604122f959653fb789e9133e94a51e369693':
Updated art for compat mode dialog.
Justin Ho [Wed, 15 Jun 2011 21:52:52 +0000 (14:52 -0700)]
Merge "Updated art for compat mode dialog." into honeycomb-mr2
Wink Saville [Wed, 15 Jun 2011 21:31:16 +0000 (14:31 -0700)]
Merge "Always clear settings when entering Inactive state." into honeycomb-LTE
OSDN Git Service
