OSDN Git Service
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
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:55:06 +0000 (13:55 -0700)]
Merge "Clean up some debug statements." into honeycomb-LTE
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:
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: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: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: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: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: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: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: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
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: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
Robert Ly [Tue, 14 Jun 2011 21:58:08 +0000 (14:58 -0700)]
am
9fa54704: Merge "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" into honeycomb-mr2
* commit '
9fa54704492234aed15ccdb29aae9261674811e3':
cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7
Robert Ly [Tue, 14 Jun 2011 21:56:00 +0000 (14:56 -0700)]
Merge "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb" into honeycomb-mr2
Robert Ly [Tue, 14 Jun 2011 21:55:35 +0000 (14:55 -0700)]
Merge "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" into honeycomb-mr2
Wink Saville [Tue, 14 Jun 2011 21:44:31 +0000 (14:44 -0700)]
Merge "Enforce provision check for CSIM record only." into honeycomb-LTE
Wink Saville [Tue, 14 Jun 2011 21:44:23 +0000 (14:44 -0700)]
Merge "Make APN re-connect delay configuable" into honeycomb-LTE
Wink Saville [Tue, 14 Jun 2011 21:44:12 +0000 (14:44 -0700)]
Merge "Revert "CDMALTE: Get roaming status based on SID/NID"" into honeycomb-LTE
Mathias Agopian [Tue, 14 Jun 2011 20:26:38 +0000 (13:26 -0700)]
am
69b4587b: DO NOT MERGE. may fix build on some version of gcc
* commit '
69b4587bfbb3e98f793959d9123340360fa233a2':
DO NOT MERGE. may fix build on some version of gcc
Mathias Agopian [Tue, 14 Jun 2011 18:50:22 +0000 (11:50 -0700)]
DO NOT MERGE. may fix build on some version of gcc
Change-Id: Iff6d9ab3a7caf58f65fc3f60633a3bd577b7af25
Dianne Hackborn [Tue, 14 Jun 2011 18:38:01 +0000 (11:38 -0700)]
am
700a1f25: Merge "Update resources documentation with new qualifiers." into honeycomb-mr2
* commit '
700a1f25719138b94c453beb6325e627a11a9883':
Update resources documentation with new qualifiers.
Dianne Hackborn [Tue, 14 Jun 2011 18:36:05 +0000 (11:36 -0700)]
am
c5193c62: Merge "Add new landscape and portrait orientation features." into honeycomb-mr2
* commit '
c5193c6285d7094fb86dcb5cd56f44a3788af7c2':
Add new landscape and portrait orientation features.
Dianne Hackborn [Tue, 14 Jun 2011 18:27:09 +0000 (11:27 -0700)]
Merge "Update resources documentation with new qualifiers." into honeycomb-mr2
Dianne Hackborn [Tue, 14 Jun 2011 18:24:29 +0000 (11:24 -0700)]
Merge "Add new landscape and portrait orientation features." into honeycomb-mr2
Mathias Agopian [Mon, 13 Jun 2011 21:13:21 +0000 (14:13 -0700)]
am
a9c9a4ba: fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
* commit '
a9c9a4baf24700e8817d47d8ea8da1742caea0b5':
fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
Mathias Agopian [Mon, 13 Jun 2011 01:05:53 +0000 (18:05 -0700)]
fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
Bug:
4595257
Change-Id: I1db83149107d7dab1f0b7e73c684e0ff82e17e62
Dianne Hackborn [Sat, 11 Jun 2011 01:39:48 +0000 (18:39 -0700)]
am
fd63814a: Merge "Fix some problems with moving in and out of detached state." into honeycomb-mr2
* commit '
fd63814abe8e81d5e1e0eb75b5a5a18034e9b4c6':
Fix some problems with moving in and out of detached state.
Dianne Hackborn [Sat, 11 Jun 2011 01:37:22 +0000 (18:37 -0700)]
Merge "Fix some problems with moving in and out of detached state." into honeycomb-mr2
Jim Miller [Sat, 11 Jun 2011 00:41:20 +0000 (17:41 -0700)]
am
8daefb9c: Fix layout issue on table when device thinks there\'s a SIM.
* commit '
8daefb9c63cce5e0a87ba38c40dd4f48be3809e1':
Fix layout issue on table when device thinks there's a SIM.
John Wang [Sat, 11 Jun 2011 00:19:42 +0000 (17:19 -0700)]
Merge "Add toString for IccCard Status and App." into honeycomb-LTE
Teng-Hui Zhu [Fri, 10 Jun 2011 21:22:52 +0000 (14:22 -0700)]
am
90bdb69b: Merge "fix one NPE when webChromeClient don\'t have progress view support" into honeycomb-mr2
* commit '
90bdb69bf95e5865547a55260dd61744b0bcc911':
fix one NPE when webChromeClient don't have progress view support
Teng-Hui Zhu [Fri, 10 Jun 2011 21:19:22 +0000 (14:19 -0700)]
Merge "fix one NPE when webChromeClient don't have progress view support" into honeycomb-mr2
Robert Greenwalt [Fri, 10 Jun 2011 21:08:28 +0000 (14:08 -0700)]
Merge "CDMALTE: Get roaming status based on SID/NID" into honeycomb-LTE
Dianne Hackborn [Fri, 10 Jun 2011 02:26:25 +0000 (19:26 -0700)]
am
2bb2d48f: Commit final (maybe) MR 2 API.
* commit '
2bb2d48f9ca1726b8de957ec7ea321c767409c12':
Commit final (maybe) MR 2 API.
Dianne Hackborn [Fri, 10 Jun 2011 00:40:08 +0000 (17:40 -0700)]
Dianne Hackborn [Fri, 10 Jun 2011 00:28:00 +0000 (17:28 -0700)]
am
f795e9a8: Okay *now* really enforce the limit on non-public styles.
* commit '
f795e9a86d4f62e5314ef95978c3ea17d90975db':
Okay *now* really enforce the limit on non-public styles.
Dianne Hackborn [Thu, 9 Jun 2011 23:14:12 +0000 (16:14 -0700)]
am
8821ba86: Ummm... f*, stop breaking the build.
* commit '
8821ba860693f5206c56ae727a4231e4d6f0a735':
Ummm... f*, stop breaking the build.
Dianne Hackborn [Thu, 9 Jun 2011 23:02:02 +0000 (16:02 -0700)]
am
220cd77d: Merge "Enforce public resource restriction on bag parents." into honeycomb-mr2
* commit '
220cd77de62956eb76c5084e1d1341d69bfd214a':
Enforce public resource restriction on bag parents.
Dianne Hackborn [Thu, 9 Jun 2011 22:55:54 +0000 (15:55 -0700)]
Merge "Enforce public resource restriction on bag parents." into honeycomb-mr2
Robert Greenwalt [Thu, 9 Jun 2011 22:48:16 +0000 (15:48 -0700)]
Merge "Set locale based on SIM preferred language." into honeycomb-LTE
Dianne Hackborn [Thu, 9 Jun 2011 18:29:08 +0000 (11:29 -0700)]
Enforce public resource restriction on bag parents.
Need to put some more styles in the SDK to avoid breaking apps.
Also, welcome Android 3.2.
Change-Id: Ia31d07c9b1b91ad868d8630437fdc1b5ae24f37d
James Dong [Thu, 9 Jun 2011 19:03:52 +0000 (12:03 -0700)]
am
e3b80c83: Merge "Revert "Add avg bandwidth estimate every 2 seconds - do not merge."" into honeycomb-mr2
* commit '
e3b80c838753fe8c9049950216c6379098465810':
Revert "Add avg bandwidth estimate every 2 seconds - do not merge."
Mike Lockwood [Thu, 9 Jun 2011 19:01:31 +0000 (12:01 -0700)]
am
b3174c46: UsbService: Fix JNI reference leak
* commit '
b3174c46ade0be4628813a74b317da538e367bc8':
UsbService: Fix JNI reference leak
James Dong [Thu, 9 Jun 2011 18:56:09 +0000 (11:56 -0700)]
Merge "Revert "Add avg bandwidth estimate every 2 seconds - do not merge."" into honeycomb-mr2
Justin Ho [Thu, 9 Jun 2011 17:22:17 +0000 (10:22 -0700)]
am
1d3173c3: Merge "Updating default wallpaper of large devices to match xlarge" into honeycomb-mr2
* commit '
1d3173c3dc93bb4f2efc5b059fec8e7577b3258a':
Updating default wallpaper of large devices to match xlarge
Xavier Ducrohet [Thu, 9 Jun 2011 17:19:14 +0000 (10:19 -0700)]
am
8ee28811: Merge changes Idbb70f53,I10426a3f into honeycomb-mr2
* commit '
8ee28811ad208d224ac8d317e4644aabc9ffb886':
Merge
06942bc4 from hc-mr1.
Merge
988eeeb5 from hc-mr1.
Justin Ho [Thu, 9 Jun 2011 17:18:13 +0000 (10:18 -0700)]
Merge "Updating default wallpaper of large devices to match xlarge" into honeycomb-mr2
Xavier Ducrohet [Thu, 9 Jun 2011 17:12:40 +0000 (10:12 -0700)]
Merge changes Idbb70f53,I10426a3f into honeycomb-mr2
* changes:
Merge
06942bc4 from hc-mr1.
Merge
988eeeb5 from hc-mr1.
Dianne Hackborn [Thu, 9 Jun 2011 05:35:25 +0000 (22:35 -0700)]
am
5ba2e872: Merge "Fix for not reporting correct "sw" in compat mode." into honeycomb-mr2
* commit '
5ba2e872fa684c0f1b992a95df00854b58f2cd8c':
Fix for not reporting correct "sw" in compat mode.
Dianne Hackborn [Thu, 9 Jun 2011 05:33:34 +0000 (22:33 -0700)]
Merge "Fix for not reporting correct "sw" in compat mode." into honeycomb-mr2
Dianne Hackborn [Thu, 9 Jun 2011 04:38:33 +0000 (21:38 -0700)]
am
e22fe933: Fix issue #
4582417: Need to add new PackageManager...
* commit '
e22fe9331ad8a9f81470751fdeca7633f654cffa':
Fix issue #
4582417: Need to add new PackageManager...
John Wang [Thu, 9 Jun 2011 03:38:59 +0000 (20:38 -0700)]
Merge "Set emergency call text visibility." into honeycomb-LTE
Dianne Hackborn [Thu, 9 Jun 2011 03:02:43 +0000 (20:02 -0700)]
am
02140891: Merge "Work on issue #
4518815: Compatibility mode introduces compatibility regression..." into honeycomb-mr2
* commit '
021408910af170268cb486910d4dd5a7d838c2bb':
Work on issue #
4518815: Compatibility mode introduces compatibility regression...
Dianne Hackborn [Thu, 9 Jun 2011 03:00:50 +0000 (20:00 -0700)]
Merge "Work on issue #
4518815: Compatibility mode introduces compatibility regression..." into honeycomb-mr2
John Wang [Thu, 9 Jun 2011 02:37:56 +0000 (19:37 -0700)]
Merge "Fix layout issue on Xoom when device thinks there's a SIM." into honeycomb-LTE
Mathias Agopian [Thu, 9 Jun 2011 02:30:47 +0000 (19:30 -0700)]
am
645434fb: Merge "Fix a leak in RefBase" into honeycomb-mr2
* commit '
645434fb4eff408698423d70904fb8fc709a5225':
Fix a leak in RefBase
Mathias Agopian [Thu, 9 Jun 2011 02:28:39 +0000 (19:28 -0700)]
Merge "Fix a leak in RefBase" into honeycomb-mr2
Dianne Hackborn [Tue, 7 Jun 2011 21:09:47 +0000 (14:09 -0700)]
Work on issue #
4518815: Compatibility mode introduces compatibility regression...
...for Market App iRunner
There were a lot of serious issues with how we updated (or often didn't update)
the display and resource state when switching compatibility mode in conjunction
with restarting and updating application components. This addresses everything
I could find.
Unfortunately it does *not* fix this particular app. I am starting to think this
is just an issue in the app. This change does fix a number of other problems
I could repro, such as switching the compatibility mode of an IME.
Also a few changes here and there to get rid of $#*&^!! debug logs.
Change-Id: Ib15572eac9ec93b4b9966ddcbbc830ce9dec1317
Adam Powell [Wed, 8 Jun 2011 23:58:35 +0000 (16:58 -0700)]
am
4381f642: Merge "Public styles for action bar tabs" into honeycomb-mr2
* commit '
4381f6421ca408d1dc66430ddfb107c5011bfe25':
Public styles for action bar tabs
Adam Powell [Wed, 8 Jun 2011 23:54:50 +0000 (16:54 -0700)]
Merge "Public styles for action bar tabs" into honeycomb-mr2
Mathias Agopian [Wed, 8 Jun 2011 23:05:30 +0000 (16:05 -0700)]
Fix a leak in RefBase
this bug was introduced recently. it caused RefBase's weakref_impl
structure to be leaked for every RefBase object (about 20 bytes).
Change-Id: Id85e749ba04521199555dd701198edd097c313d4
Wink Saville [Wed, 8 Jun 2011 22:00:46 +0000 (15:00 -0700)]
Merge "Report data status from ApnContext even if data is detached" into honeycomb-LTE
Wink Saville [Wed, 8 Jun 2011 21:58:53 +0000 (14:58 -0700)]
Merge "Use CSIM to get provision information" into honeycomb-LTE
John Wang [Wed, 8 Jun 2011 20:52:26 +0000 (13:52 -0700)]
am
cea03df2: Do not merge. Return null id for Non-phone device.
* commit '
cea03df201dc6659654234bc5fbfebf1b6a06e42':
Do not merge. Return null id for Non-phone device.
Jeff Brown [Wed, 8 Jun 2011 20:52:22 +0000 (13:52 -0700)]
am
25bd8abc: Merge "Fix swipe gesture cosine calculation. Bug:
4124987" into honeycomb-mr2
* commit '
25bd8abce993e17b382ea5c29a1cb68dd095cf45':
Fix swipe gesture cosine calculation. Bug:
4124987
Wink Saville [Wed, 8 Jun 2011 19:56:27 +0000 (12:56 -0700)]
Merge "Fix default preferred network." into honeycomb-LTE
Jeff Brown [Tue, 7 Jun 2011 23:58:06 +0000 (16:58 -0700)]
Merge "Fix swipe gesture cosine calculation. Bug:
4124987" into honeycomb-mr2
Adam Powell [Tue, 7 Jun 2011 23:22:32 +0000 (16:22 -0700)]
am
68b81434: Merge "Fix bug
4533120 - rough handling of invalid event streams in ScaleGestureDetector" into honeycomb-mr2
* commit '
68b81434963db90e0d5b14710e4edd86084ede3c':
Fix bug
4533120 - rough handling of invalid event streams in ScaleGestureDetector
Adam Powell [Tue, 7 Jun 2011 23:19:26 +0000 (16:19 -0700)]
Merge "Fix bug
4533120 - rough handling of invalid event streams in ScaleGestureDetector" into honeycomb-mr2
John Wang [Tue, 7 Jun 2011 22:49:34 +0000 (15:49 -0700)]
Merge "Make getDeviceId return null for Non-phone device." into honeycomb-LTE
Dianne Hackborn [Tue, 7 Jun 2011 22:47:14 +0000 (15:47 -0700)]
am
a3ce0f1e: Merge "Remove compat mode dialog." into honeycomb-mr2
* commit '
a3ce0f1e6f92e9580b0b0cbdc6cc124d2163f6c5':
Remove compat mode dialog.
Dianne Hackborn [Tue, 7 Jun 2011 22:45:14 +0000 (15:45 -0700)]
Merge "Remove compat mode dialog." into honeycomb-mr2
Dianne Hackborn [Tue, 7 Jun 2011 22:39:43 +0000 (15:39 -0700)]
am
dfe824ef: Merge "DO NOT MERGE. Experimental compatibility mode UI." into honeycomb-mr2
* commit '
dfe824ef3e5d8b2adac97c667cd51c7dfdb3c7af':
DO NOT MERGE. Experimental compatibility mode UI.
Dianne Hackborn [Tue, 7 Jun 2011 22:36:51 +0000 (15:36 -0700)]
Merge "DO NOT MERGE. Experimental compatibility mode UI." into honeycomb-mr2
Mathias Agopian [Tue, 7 Jun 2011 21:58:02 +0000 (14:58 -0700)]
am
f6c82067: fix a surface leak introduced by a failed merge (DO NOT MERGE)
* commit '
f6c8206735e7e078461e5f2aef6e1a1446fdd075':
fix a surface leak introduced by a failed merge (DO NOT MERGE)
Mathias Agopian [Tue, 7 Jun 2011 21:52:22 +0000 (14:52 -0700)]
fix a surface leak introduced by a failed merge (DO NOT MERGE)
Bug:
4558502
Change-Id: Ibf889d03caa806c34603ad45f135b78c3851f55c
Irfan Sheriff [Tue, 7 Jun 2011 20:40:38 +0000 (13:40 -0700)]
Merge "Clear IP configuration on lost network" into honeycomb-LTE
John Wang [Tue, 7 Jun 2011 19:56:49 +0000 (12:56 -0700)]
Merge "Add SIM PUK unlockscreen." into honeycomb-LTE
OSDN Git Service
