OSDN Git Service
Mathias Agopian [Fri, 17 Jun 2011 01:15:19 +0000 (18:15 -0700)]
am
48294b0d: am
e7d3ee9d: Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)
* commit '
48294b0d9388cff632f0e6ae5220305d342c76fb':
Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)
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 [Fri, 17 Jun 2011 00:14:28 +0000 (17:14 -0700)]
am
c6b32054: am
c826f92e: Merge "Revert "Do not merge. Return null id for Non-phone device."" into honeycomb-mr2
* commit '
c6b32054c67901b0627ad99e4bd8b15c5cc2fb90':
Revert "Do not merge. Return null id for Non-phone device."
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
Maarten Hooft [Thu, 16 Jun 2011 22:55:14 +0000 (15:55 -0700)]
am
42781a11: am
d76baeb4: Merge "Import revised Croatian translations." into gingerbread
* commit '
42781a11ce9e346a24fbb6214f8f214845464213':
Import revised Croatian translations.
Maarten Hooft [Thu, 16 Jun 2011 22:48:55 +0000 (15:48 -0700)]
am
d76baeb4: Merge "Import revised Croatian translations." into gingerbread
* commit '
d76baeb4d836c33cc68cbb0c2e237c066f368529':
Import revised Croatian translations.
Maarten Hooft [Thu, 16 Jun 2011 22:41:20 +0000 (15:41 -0700)]
Merge "Import revised Croatian translations." into gingerbread
Dianne Hackborn [Thu, 16 Jun 2011 22:25:22 +0000 (15:25 -0700)]
am
9a73c4d3: am
2f04883f: SDK only: integrate new sample code, deprecating along the way.
* commit '
9a73c4d3a9c7ce02f80b078ca9ba5106234ecd9c':
SDK only: integrate new sample code, deprecating along the way.
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:55:01 +0000 (14:55 -0700)]
am
f1c5dbbd: am
abd4dffc: Merge "New orientation handling. Only impacts SDK (aapt dump badging)." into honeycomb-mr2
* commit '
f1c5dbbd457bb14d3673508aaba497cdc328a1ef':
New orientation handling. Only impacts SDK (aapt dump badging).
Robert Greenwalt [Thu, 16 Jun 2011 21:50:22 +0000 (14:50 -0700)]
am
62385d5e: am
6b93f976: Merge "DO NOT MERGE" into honeycomb-mr2
* commit '
62385d5e3183d35b22618fb91bb2dfa0de7e5fd4':
DO NOT MERGE
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:55:30 +0000 (13:55 -0700)]
am
d1abd94f: am
04ce8111: Bring in more layout lib changes from hc-mr1.
* commit '
d1abd94f57c0162186c57aea98790e8fa281e0a2':
Bring in more layout lib changes from hc-mr1.
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 19:42:15 +0000 (12:42 -0700)]
am
5f350512: Merge "Reset connections AFTER we take down the network." into honeycomb-LTE
* commit '
5f3505121b761dbd3bba62d1603fbab49de139b9':
Reset connections AFTER we take down the network.
John Wang [Thu, 16 Jun 2011 19:34:34 +0000 (12:34 -0700)]
am
ff42c04d: Merge "Support SIM permanently disabled state." into honeycomb-LTE
* commit '
ff42c04d15e000f6295e796e154cc60c54aa078b':
Support SIM permanently disabled state.
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:42:52 +0000 (22:42 -0700)]
am
0887b8c2: am
8e18668d: revert surfaceflinger leak fix as it uncovered a crasher on xoom (DO NOT MERGE)
* commit '
0887b8c2e583e682cd2c1bc909cb3fdbec704004':
revert surfaceflinger leak fix as it uncovered a crasher on xoom (DO NOT MERGE)
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:12:32 +0000 (22:12 -0700)]
am
d5244e0a: am
52a43990: Revert "revert surfaceflinger leak fix as it uncovered a crasher on xoom"
* commit '
d5244e0a88ed2f843651aa5ffdc71a45c968e0f3':
Revert "revert surfaceflinger leak fix as it uncovered a crasher on xoom"
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:21:31 +0000 (20:21 -0700)]
am
7ecdeb6e: am
d20d72d1: Merge "revert surfaceflinger leak fix as it uncovered a crasher on xoom" into honeycomb-mr2
* commit '
7ecdeb6e548ff71d4f70b343e30136e89eaa3e33':
revert surfaceflinger leak fix as it uncovered a crasher on xoom
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:12:45 +0000 (17:12 -0700)]
am
413b53b5: am
70921d61: Merge "We must keep up with the Joneses." into honeycomb-mr2
* commit '
413b53b57d62b60e98cfe5b9359551315e7cb3a7':
We must keep up with the Joneses.
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:47:08 +0000 (16:47 -0700)]
am
c0e84cf3: am
5e451faa: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
* commit '
c0e84cf3210fc6b5929d024fafbe75f08167c44e':
Import revised translations. DO NOT MERGE
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
Irfan Sheriff [Wed, 15 Jun 2011 23:35:20 +0000 (16:35 -0700)]
am
a4644307: (-s ours) am
df1734e3: Fix lease duration handling
* commit '
a464430762bad8039a598ce9af71f962d01f8eba':
Fix lease duration handling
Irfan Sheriff [Wed, 15 Jun 2011 23:29:02 +0000 (16:29 -0700)]
am
df1734e3: Fix lease duration handling
* commit '
df1734e3f57646df1fa96275cbb65bb91ac9d2ac':
Fix lease duration handling
Justin Ho [Wed, 15 Jun 2011 21:58:56 +0000 (14:58 -0700)]
am
c407ef22: am
f4096041: Merge "Updated art for compat mode dialog." into honeycomb-mr2
* commit '
c407ef22222f8f7e6f82abd081ecb65149336f99':
Updated art for compat mode dialog.
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:34:08 +0000 (14:34 -0700)]
am
1146bddf: Merge "Always clear settings when entering Inactive state." into honeycomb-LTE
* commit '
1146bddf92fc91dad384bdaea740f9472bebd911':
Always clear settings when entering Inactive state.
Wink Saville [Wed, 15 Jun 2011 21:31:16 +0000 (14:31 -0700)]
Merge "Always clear settings when entering Inactive state." into honeycomb-LTE
Jean-Baptiste Queru [Wed, 15 Jun 2011 21:25:37 +0000 (14:25 -0700)]
Merge
5137711109783dcbb20143d3e5cab2fa931218dd
Change-Id: I5046a54648bdeea6f9661c46329d7b502f2f52b9
Mathias Agopian [Wed, 15 Jun 2011 21:13:04 +0000 (14:13 -0700)]
am
afffa8fa: fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
* commit '
afffa8fa9f82a7343e1158bf921931fd3e3df615':
fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
Irfan Sheriff [Wed, 15 Jun 2011 21:07:54 +0000 (14:07 -0700)]
am
5af3405f: am
ecda5461: Merge "Fix lease duration handling" into honeycomb-mr2
* commit '
5af3405f0d24c853bd10eb239c081e31972d3e1d':
Fix lease duration handling
Irfan Sheriff [Wed, 15 Jun 2011 21:04:23 +0000 (14:04 -0700)]
am
ecda5461: Merge "Fix lease duration handling" into honeycomb-mr2
* commit '
ecda5461603b6de77beb045dfdf82dad7ae48d61':
Fix lease duration handling
Irfan Sheriff [Wed, 15 Jun 2011 21:00:23 +0000 (14:00 -0700)]
Merge "Fix lease duration handling" into honeycomb-mr2
Wink Saville [Wed, 15 Jun 2011 20:58:20 +0000 (13:58 -0700)]
am
4d6233b2: Merge "Clean up some debug statements." into honeycomb-LTE
* commit '
4d6233b2edd24c83efe10f4403456b8d0c87241a':
Clean up some debug statements.
Wink Saville [Wed, 15 Jun 2011 20:55:06 +0000 (13:55 -0700)]
Merge "Clean up some debug statements." into honeycomb-LTE
Dianne Hackborn [Wed, 15 Jun 2011 20:44:16 +0000 (13:44 -0700)]
am
3dc1b5e2: am
ed31bbf6: Clean up some edge cases in the compat mode UI:
* commit '
3dc1b5e26fac2c6a6161d617f99fd901ee2ffc9e':
Clean up some edge cases in the compat mode UI:
Dianne Hackborn [Wed, 15 Jun 2011 19:35:57 +0000 (12:35 -0700)]
am
ed31bbf6: Clean up some edge cases in the compat mode UI:
* commit '
ed31bbf65267c1f383dd0dff37acd034f3b9b59f':
Clean up some edge cases in the compat mode UI:
Marco Nelissen [Wed, 15 Jun 2011 19:20:57 +0000 (12:20 -0700)]
am
d8f9a83c: resolved conflicts for merge of
d027329c to gingerbread-plus-aosp
* commit '
d8f9a83cab34de38981dc3ba5ca9df8dda02dbc0':
Ignore duplicate WAP push PDU source/destination port if configured
Marco Nelissen [Wed, 15 Jun 2011 15:33:09 +0000 (08:33 -0700)]
resolved conflicts for merge of
d027329c to gingerbread-plus-aosp
Change-Id: I169c415bf998b9935ab36812511573db05717b91
Daniel Sandler [Wed, 15 Jun 2011 13:25:35 +0000 (06:25 -0700)]
am
fbb09347: am
5994bff9: Merge "One-time-only compatibility mode explanation dialog." into honeycomb-mr2
* commit '
fbb093479362865da833b89643a8f58347278bc3':
One-time-only compatibility mode explanation dialog.
Daniel Sandler [Wed, 15 Jun 2011 13:25:24 +0000 (06:25 -0700)]
am
2fdf5880: am
97d5081a: Merge "Final UI for compatibility mode." into honeycomb-mr2
* commit '
2fdf5880611c333e172d4e0cc2c4259bca324699':
Final UI for compatibility mode.
Daniel Sandler [Wed, 15 Jun 2011 13:15:11 +0000 (06:15 -0700)]
am
5994bff9: Merge "One-time-only compatibility mode explanation dialog." into honeycomb-mr2
* commit '
5994bff92472b3bdcd5754d8a9156b49269a9c1d':
One-time-only compatibility mode explanation dialog.
Daniel Sandler [Wed, 15 Jun 2011 13:15:07 +0000 (06:15 -0700)]
am
97d5081a: Merge "Final UI for compatibility mode." into honeycomb-mr2
* commit '
97d5081ac331884fe0f6f2e5814d4862a974fbe3':
Final UI for compatibility mode.
Daniel Sandler [Wed, 15 Jun 2011 13:10:32 +0000 (06:10 -0700)]
Merge "One-time-only compatibility mode explanation dialog." into honeycomb-mr2
Daniel Sandler [Wed, 15 Jun 2011 13:10:27 +0000 (06:10 -0700)]
Merge "Final UI for compatibility mode." into honeycomb-mr2
Dianne Hackborn [Wed, 15 Jun 2011 04:50:56 +0000 (21:50 -0700)]
am
abe5bd23: am
a9551706: Testing done, compatibility mode no longer on by default.
* commit '
abe5bd23c341da035e9905d9e50c1d6bccf229dc':
Testing done, compatibility mode no longer on by default.
Dianne Hackborn [Wed, 15 Jun 2011 04:47:51 +0000 (21:47 -0700)]
am
a9551706: Testing done, compatibility mode no longer on by default.
* commit '
a9551706a279a798c91d8ef593b2acb16a30c682':
Testing done, compatibility mode no longer on by default.
Dianne Hackborn [Wed, 15 Jun 2011 03:57:48 +0000 (20:57 -0700)]
am
baa89d38: am
f930232f: Fix a major problem in fragment lifecycle.
* commit '
baa89d3839f70bd31e5219c636ac24a4cc29928d':
Fix a major problem in fragment lifecycle.
Dianne Hackborn [Wed, 15 Jun 2011 03:54:40 +0000 (20:54 -0700)]
am
f930232f: Fix a major problem in fragment lifecycle.
* commit '
f930232fd1c8d301d91853c8fe5dca43979ac807':
Fix a major problem in fragment lifecycle.
Dianne Hackborn [Wed, 15 Jun 2011 02:22:42 +0000 (19:22 -0700)]
am
027e9e28: am
4e04380d: Merge "Fix issue #
4592768: Xoom display does not resize when..." into honeycomb-mr2
* commit '
027e9e28b2880b8e50912d7c25e68e8f196bb66b':
Fix issue #
4592768: Xoom display does not resize when...
Dianne Hackborn [Wed, 15 Jun 2011 02:19:25 +0000 (19:19 -0700)]
am
4e04380d: Merge "Fix issue #
4592768: Xoom display does not resize when..." into honeycomb-mr2
* commit '
4e04380d0a42347013808ee2058c786582ad548f':
Fix issue #
4592768: Xoom display does not resize when...
Dianne Hackborn [Wed, 15 Jun 2011 02:16:46 +0000 (19:16 -0700)]
Merge "Fix issue #
4592768: Xoom display does not resize when..." into honeycomb-mr2
Robert Ly [Wed, 15 Jun 2011 00:52:55 +0000 (17:52 -0700)]
am
b481a600: am
c7731e07: Merge "cherrypick from hc mr1 Change-Id: I2d17c5ea710964b0fe57e6adea4383f30d74bf7d" into honeycomb-mr2
* commit '
b481a6007f3c0e9f50ddb2e126fc5d8188961b25':
cherrypick from hc mr1 Change-Id: I2d17c5ea710964b0fe57e6adea4383f30d74bf7d
Robert Ly [Wed, 15 Jun 2011 00:51:08 +0000 (17:51 -0700)]
am
4963cd0b: am
1a3e7cf2: Merge "cherry pick from hc mr1 Change-Id: I6f48d245e2837226096fe42d08fb0243e416dbbc" into honeycomb-mr2
* commit '
4963cd0bd1d63fe5a444b2299758d2a2696776f1':
cherry pick from hc mr1 Change-Id: I6f48d245e2837226096fe42d08fb0243e416dbbc
Robert Ly [Wed, 15 Jun 2011 00:47:51 +0000 (17:47 -0700)]
am
c7731e07: Merge "cherrypick from hc mr1 Change-Id: I2d17c5ea710964b0fe57e6adea4383f30d74bf7d" into honeycomb-mr2
* commit '
c7731e070e09007fdd002fd44dfe35bdeffbaac5':
cherrypick from hc mr1 Change-Id: I2d17c5ea710964b0fe57e6adea4383f30d74bf7d
Robert Ly [Wed, 15 Jun 2011 00:46:07 +0000 (17:46 -0700)]
am
1a3e7cf2: Merge "cherry pick from hc mr1 Change-Id: I6f48d245e2837226096fe42d08fb0243e416dbbc" into honeycomb-mr2
* commit '
1a3e7cf259ef8eecdea236b3cba1608e1bd871e3':
cherry pick from hc mr1 Change-Id: I6f48d245e2837226096fe42d08fb0243e416dbbc
Robert Ly [Wed, 15 Jun 2011 00:45:04 +0000 (17:45 -0700)]
Merge "cherrypick from hc mr1 Change-Id: I2d17c5ea710964b0fe57e6adea4383f30d74bf7d" into honeycomb-mr2
Robert Ly [Wed, 15 Jun 2011 00:43:38 +0000 (17:43 -0700)]
Merge "cherry pick from hc mr1 Change-Id: I6f48d245e2837226096fe42d08fb0243e416dbbc" into honeycomb-mr2
Robert Ly [Tue, 14 Jun 2011 23:41:55 +0000 (16:41 -0700)]
am
1dbb7075: am
8467cd7f: Merge "cherrypick from hc mr1 Change-Id: I0685106aba681a429ce92c0ec1a4fab592d186ac" into honeycomb-mr2
* commit '
1dbb707592f0aff35e5ca1115f7ee278a5977c42':
cherrypick from hc mr1 Change-Id: I0685106aba681a429ce92c0ec1a4fab592d186ac
Robert Ly [Tue, 14 Jun 2011 23:41:52 +0000 (16:41 -0700)]
am
17cddaf2: am
409b9a4c: Merge "Revert "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7"" into honeycomb-mr2
* commit '
17cddaf2a64c8392a8e852283e720d3abdaca9b3':
Revert "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7"
Robert Ly [Tue, 14 Jun 2011 23:41:49 +0000 (16:41 -0700)]
am
b5c31b8a: am
194f4745: Merge "Revert "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb"" into honeycomb-mr2
* commit '
b5c31b8a11d4f898b0f9aa6eaf7a89195d800409':
Revert "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb"
Robert Ly [Tue, 14 Jun 2011 23:38:08 +0000 (16:38 -0700)]
am
8467cd7f: Merge "cherrypick from hc mr1 Change-Id: I0685106aba681a429ce92c0ec1a4fab592d186ac" into honeycomb-mr2
* commit '
8467cd7f90a23c345b41cfcdcc62f1f8e3716c37':
cherrypick from hc mr1 Change-Id: I0685106aba681a429ce92c0ec1a4fab592d186ac
Robert Ly [Tue, 14 Jun 2011 23:38:05 +0000 (16:38 -0700)]
am
409b9a4c: Merge "Revert "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7"" into honeycomb-mr2
* commit '
409b9a4cad1d2dad43e647fc63a4ab1f3435d437':
Revert "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7"
Robert Ly [Tue, 14 Jun 2011 23:38:02 +0000 (16:38 -0700)]
am
194f4745: Merge "Revert "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb"" into honeycomb-mr2
* commit '
194f47451ce3a0d346e362dfd8753057f41c765d':
Revert "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb"
Robert Ly [Tue, 14 Jun 2011 23:36:17 +0000 (16:36 -0700)]
Merge "cherrypick from hc mr1 Change-Id: I0685106aba681a429ce92c0ec1a4fab592d186ac" into honeycomb-mr2
Robert Ly [Tue, 14 Jun 2011 23:35:22 +0000 (16:35 -0700)]
Merge "Revert "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7"" into honeycomb-mr2
Robert Ly [Tue, 14 Jun 2011 23:35:12 +0000 (16:35 -0700)]
Merge "Revert "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb"" into honeycomb-mr2
Amith Yamasani [Tue, 14 Jun 2011 22:42:36 +0000 (15:42 -0700)]
am
eb5e633a: am
608a200d: Merge "Stability fixes for PreferenceFragments." into honeycomb-mr2
* commit '
eb5e633a2488456874f829263fa6cb96588d25aa':
Stability fixes for PreferenceFragments.
Amith Yamasani [Tue, 14 Jun 2011 22:38:31 +0000 (15:38 -0700)]
am
608a200d: Merge "Stability fixes for PreferenceFragments." into honeycomb-mr2
* commit '
608a200d2ed19540bb356d54e96f72c8c6b089b1':
Stability fixes for PreferenceFragments.
Amith Yamasani [Tue, 14 Jun 2011 22:35:13 +0000 (15:35 -0700)]
Merge "Stability fixes for PreferenceFragments." into honeycomb-mr2
Dianne Hackborn [Tue, 14 Jun 2011 22:22:12 +0000 (15:22 -0700)]
am
7c7f8e18: am
0a8a2324: Merge "Fix issue #
4603422: Compatibility mode button doesn\'t always update" into honeycomb-mr2
* commit '
7c7f8e18dee8b582ec8e30a1412903ceec2ef5f5':
Fix issue #
4603422: Compatibility mode button doesn't always update
Dianne Hackborn [Tue, 14 Jun 2011 22:14:34 +0000 (15:14 -0700)]
am
0a8a2324: Merge "Fix issue #
4603422: Compatibility mode button doesn\'t always update" into honeycomb-mr2
* commit '
0a8a2324239d7604e2a68349585aa67b59b25f4c':
Fix issue #
4603422: Compatibility mode button doesn't always update
Robert Ly [Tue, 14 Jun 2011 22:13:21 +0000 (15:13 -0700)]
am
5d730c92: am
86ef7977: Merge "cherrypick from hc mr1 Change-Id: I106cddd6e22d72c48edeaadbf296b0453813d06a" into honeycomb-mr2
* commit '
5d730c9237fdf3252a9aa0c01c1653bae69f4f39':
cherrypick from hc mr1 Change-Id: I106cddd6e22d72c48edeaadbf296b0453813d06a
Dianne Hackborn [Tue, 14 Jun 2011 22:12:01 +0000 (15:12 -0700)]
Merge "Fix issue #
4603422: Compatibility mode button doesn't always update" into honeycomb-mr2
Robert Ly [Tue, 14 Jun 2011 22:10:07 +0000 (15:10 -0700)]
am
86ef7977: Merge "cherrypick from hc mr1 Change-Id: I106cddd6e22d72c48edeaadbf296b0453813d06a" into honeycomb-mr2
* commit '
86ef7977a95d6e1783f646d96992582d1dbf080a':
cherrypick from hc mr1 Change-Id: I106cddd6e22d72c48edeaadbf296b0453813d06a
Robert Ly [Tue, 14 Jun 2011 22:06:42 +0000 (15:06 -0700)]
Merge "cherrypick from hc mr1 Change-Id: I106cddd6e22d72c48edeaadbf296b0453813d06a" into honeycomb-mr2
Robert Ly [Tue, 14 Jun 2011 22:04:22 +0000 (15:04 -0700)]
am
b658dfb8: am
cbd31aec: Merge "cherry pick from hc mr1 Change-Id: Icd86c888b061e7b6770363443fea490c49b7739e" into honeycomb-mr2
* commit '
b658dfb8f4363643b9426649ffc8e48be5c332f6':
cherry pick from hc mr1 Change-Id: Icd86c888b061e7b6770363443fea490c49b7739e
Robert Ly [Tue, 14 Jun 2011 22:02:28 +0000 (15:02 -0700)]
am
cbfab050: am
a91d6552: Merge "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb" into honeycomb-mr2
* commit '
cbfab050756555a2f7d707522a9d044bcaa4e0c8':
cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb
Robert Ly [Tue, 14 Jun 2011 22:02:25 +0000 (15:02 -0700)]
am
4cd4c820: am
9fa54704: Merge "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" into honeycomb-mr2
* commit '
4cd4c82073a6066bb94cce089cd259d19969c0fd':
cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7
Robert Ly [Tue, 14 Jun 2011 22:01:48 +0000 (15:01 -0700)]
am
cbd31aec: Merge "cherry pick from hc mr1 Change-Id: Icd86c888b061e7b6770363443fea490c49b7739e" into honeycomb-mr2
* commit '
cbd31aec9f4a7367d440bfb0c9683bd481461995':
cherry pick from hc mr1 Change-Id: Icd86c888b061e7b6770363443fea490c49b7739e
Robert Ly [Tue, 14 Jun 2011 21:58:32 +0000 (14:58 -0700)]
Merge "cherry pick from hc mr1 Change-Id: Icd86c888b061e7b6770363443fea490c49b7739e" into honeycomb-mr2
Robert Ly [Tue, 14 Jun 2011 21:58:11 +0000 (14:58 -0700)]
am
a91d6552: Merge "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb" into honeycomb-mr2
* commit '
a91d6552913c02538b3f97e774e9771cfbef9dec':
cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb
OSDN Git Service
