OSDN Git Service
Fabrice Di Meglio [Wed, 15 Jun 2011 17:34:09 +0000 (10:34 -0700)]
Merge "Fix Gravity start/end"
Elliott Hughes [Wed, 15 Jun 2011 17:24:29 +0000 (10:24 -0700)]
Merge "de_DE "Mai" isn't an abbreviation."
Daniel Sandler [Wed, 15 Jun 2011 17:21:44 +0000 (10:21 -0700)]
Merge "Swipe to veto in notifications."
Gilles Debunne [Wed, 15 Jun 2011 16:46:55 +0000 (09:46 -0700)]
Merge "Bug
4579629. Send before and after text when suggestion is picked."
John Reck [Wed, 15 Jun 2011 16:12:14 +0000 (09:12 -0700)]
Merge "Support for getting the background color"
Daniel Sandler [Wed, 15 Jun 2011 13:36:56 +0000 (06:36 -0700)]
am
2897fc4c: am
fbb09347: am
5994bff9: Merge "One-time-only compatibility mode explanation dialog." into honeycomb-mr2
* commit '
2897fc4cc320d9fea2c6a81d7e2b05b6b820acf0':
One-time-only compatibility mode explanation dialog.
Daniel Sandler [Wed, 15 Jun 2011 13:36:35 +0000 (06:36 -0700)]
am
d163a616: am
2fdf5880: am
97d5081a: Merge "Final UI for compatibility mode." into honeycomb-mr2
* commit '
d163a6162891f0e14d4536460d839262d2693e9a':
Final UI for compatibility mode.
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
Narayan Kamath [Wed, 15 Jun 2011 12:43:34 +0000 (05:43 -0700)]
Merge "Fix a bug in TextToSpeech."
Hung-ying Tyan [Wed, 15 Jun 2011 10:17:50 +0000 (03:17 -0700)]
Merge "Move WakeupTimer out of SipService."
Adam Powell [Wed, 15 Jun 2011 05:11:26 +0000 (22:11 -0700)]
Merge "Make FastScroller behave kinder and gentler when an app decides to return null from SectionIndexer#getSections()"
Jeff Brown [Wed, 15 Jun 2011 05:08:49 +0000 (22:08 -0700)]
Merge "Add support for disabling pointer gestures."
Jeff Brown [Wed, 15 Jun 2011 05:08:41 +0000 (22:08 -0700)]
Merge "EventHub code cleanup."
Dianne Hackborn [Wed, 15 Jun 2011 04:53:25 +0000 (21:53 -0700)]
am
d00bebb0: am
abe5bd23: am
a9551706: Testing done, compatibility mode no longer on by default.
* commit '
d00bebb005794afc739f54ff21c6ffd7c866738a':
Testing done, compatibility mode no longer on by default.
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.
Jaikumar Ganesh [Wed, 15 Jun 2011 04:33:03 +0000 (21:33 -0700)]
Merge "Refactor Bluetooth Profile."
Dianne Hackborn [Wed, 15 Jun 2011 04:01:45 +0000 (21:01 -0700)]
am
27bad6f3: am
baa89d38: am
f930232f: Fix a major problem in fragment lifecycle.
* commit '
27bad6f33b98e8d7417a6ce4d7f09b2fa1146379':
Fix a major problem in fragment lifecycle.
Kristian Monsen [Wed, 15 Jun 2011 03:57:57 +0000 (20:57 -0700)]
Merge "Merge chromium to r11.0.672.0: Compile fix"
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:57:15 +0000 (20:57 -0700)]
am
ca2832bc: am
027e9e28: am
4e04380d: Merge "Fix issue #
4592768: Xoom display does not resize when..." into honeycomb-mr2
* commit '
ca2832bc60b986db245ced0e4a2b8a77d4982f32':
Fix issue #
4592768: Xoom display does not resize when...
Robert Ly [Wed, 15 Jun 2011 03:57:11 +0000 (20:57 -0700)]
am
2ecb884f: am
b481a600: am
c7731e07: Merge "cherrypick from hc mr1 Change-Id: I2d17c5ea710964b0fe57e6adea4383f30d74bf7d" into honeycomb-mr2
* commit '
2ecb884f7586218a1608cd5b0d82a45de6f9a069':
cherrypick from hc mr1 Change-Id: I2d17c5ea710964b0fe57e6adea4383f30d74bf7d
Robert Ly [Wed, 15 Jun 2011 03:57:07 +0000 (20:57 -0700)]
am
8a8f82bb: am
4963cd0b: am
1a3e7cf2: Merge "cherry pick from hc mr1 Change-Id: I6f48d245e2837226096fe42d08fb0243e416dbbc" into honeycomb-mr2
* commit '
8a8f82bbd606657df8a804b4cd499556e2292404':
cherry pick from hc mr1 Change-Id: I6f48d245e2837226096fe42d08fb0243e416dbbc
Robert Ly [Wed, 15 Jun 2011 03:57:01 +0000 (20:57 -0700)]
am
5e69c0f5: am
1dbb7075: am
8467cd7f: Merge "cherrypick from hc mr1 Change-Id: I0685106aba681a429ce92c0ec1a4fab592d186ac" into honeycomb-mr2
* commit '
5e69c0f5569940b5f6a0f9c5a2677639c5ed3062':
cherrypick from hc mr1 Change-Id: I0685106aba681a429ce92c0ec1a4fab592d186ac
Robert Ly [Wed, 15 Jun 2011 03:56:57 +0000 (20:56 -0700)]
am
f3c9a251: am
17cddaf2: am
409b9a4c: Merge "Revert "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7"" into honeycomb-mr2
* commit '
f3c9a2517ad9db2af4e11435068c24410eaf9c57':
Revert "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7"
Robert Ly [Wed, 15 Jun 2011 03:56:51 +0000 (20:56 -0700)]
am
2aeafe0b: am
b5c31b8a: am
194f4745: Merge "Revert "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb"" into honeycomb-mr2
* commit '
2aeafe0baaab1f833110994deb7cd6714cab1d5f':
Revert "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb"
Amith Yamasani [Wed, 15 Jun 2011 03:56:23 +0000 (20:56 -0700)]
am
2bcd9c6e: am
eb5e633a: am
608a200d: Merge "Stability fixes for PreferenceFragments." into honeycomb-mr2
* commit '
2bcd9c6e7b4fe6c465811e9b8ac48acec23cb341':
Stability fixes for PreferenceFragments.
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 03:41:27 +0000 (20:41 -0700)]
Merge "resolved conflicts for merge of
e95c07bd to master"
Adam Powell [Wed, 15 Jun 2011 03:29:03 +0000 (20:29 -0700)]
Merge "Fix bug
4521549 - Crash in ScrollingTabContainerView, when using a tab with null text"
Bart Sears [Wed, 15 Jun 2011 03:23:15 +0000 (20:23 -0700)]
Merge "Latest drop of DroidSansFallback.ttf from Monotype"
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
Xia Wang [Wed, 15 Jun 2011 02:08:22 +0000 (19:08 -0700)]
Merge "Add more opengl benchmark test: - all apps in launcher - shortcuts of apps in home page"
Glenn Kasten [Wed, 15 Jun 2011 00:54:25 +0000 (17:54 -0700)]
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
Romain Guy [Wed, 15 Jun 2011 00:08:36 +0000 (17:08 -0700)]
Merge "Add TextureView.getBitmap()"
Nick Pelly [Wed, 15 Jun 2011 00:06:54 +0000 (17:06 -0700)]
Merge "minor documentation fixes"
James Dong [Wed, 15 Jun 2011 00:01:11 +0000 (17:01 -0700)]
Merge "Enforce the rule that the timestamp from timelapse video source monotically increases"
James Dong [Wed, 15 Jun 2011 00:00:49 +0000 (17:00 -0700)]
Merge "Update MediaPlayer and MediaRecorder javadoc"
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
Fabrice Di Meglio [Tue, 14 Jun 2011 23:23:06 +0000 (16:23 -0700)]
Merge "Add View.getResolvedLayoutDirection()"
Dianne Hackborn [Tue, 14 Jun 2011 23:13:26 +0000 (16:13 -0700)]
resolved conflicts for merge of
e95c07bd to master
Change-Id: I9af0c08a9f1c1f68661efe051a66835e850b76f6
Robert Ly [Tue, 14 Jun 2011 22:50:38 +0000 (15:50 -0700)]
resolved conflicts for merge of
398d021b to master
Change-Id: I4f8a2cfec95bf31c38365da0257e8d13897bb197
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
Gloria Wang [Tue, 14 Jun 2011 22:35:11 +0000 (15:35 -0700)]
Merge "To remove log spam in the Forward Lock DRM plugin. Fix for bug
4619159."
Robert Ly [Tue, 14 Jun 2011 22:25:00 +0000 (15:25 -0700)]
am
0b7d7f53: am
b658dfb8: am
cbd31aec: Merge "cherry pick from hc mr1 Change-Id: Icd86c888b061e7b6770363443fea490c49b7739e" into honeycomb-mr2
* commit '
0b7d7f53a958132eb539fc81130423878c2db650':
cherry pick from hc mr1 Change-Id: Icd86c888b061e7b6770363443fea490c49b7739e
Robert Ly [Tue, 14 Jun 2011 22:22:51 +0000 (15:22 -0700)]
am
ae6dc0c5: am
cbfab050: am
a91d6552: Merge "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb" into honeycomb-mr2
* commit '
ae6dc0c5e213ce5ca3c504020bc73993e1aceb9a':
cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb
Robert Ly [Tue, 14 Jun 2011 22:22:47 +0000 (15:22 -0700)]
am
ff46480e: am
4cd4c820: am
9fa54704: Merge "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" into honeycomb-mr2
* commit '
ff46480e748555a923242af4238ec8d4822fd2ae':
cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7
Wink Saville [Tue, 14 Jun 2011 22:22:42 +0000 (15:22 -0700)]
am
5d47d203: am
fbef26eb: Merge "Enforce provision check for CSIM record only." into honeycomb-LTE
* commit '
5d47d203fb60f4e7c91d97fa852a23863861b011':
Enforce provision check for CSIM record only.
Wink Saville [Tue, 14 Jun 2011 22:22:38 +0000 (15:22 -0700)]
am
aad3c3cb: am
c2d17d3b: Merge "Make APN re-connect delay configuable" into honeycomb-LTE
* commit '
aad3c3cbb8d6ceebcf99b80b1567f310b3216d6a':
Make APN re-connect delay configuable
Wink Saville [Tue, 14 Jun 2011 22:22:33 +0000 (15:22 -0700)]
am
46cd4a4b: am
82c1a5de: Merge "Revert "CDMALTE: Get roaming status based on SID/NID"" into honeycomb-LTE
* commit '
46cd4a4bfe432ed6b483c0d6fc1045e387f22710':
Revert "CDMALTE: Get roaming status based on SID/NID"
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
Mathias Agopian [Tue, 14 Jun 2011 22:22:12 +0000 (15:22 -0700)]
am
9ee39758: (-s ours) am
a9007fbd: am
69b4587b: DO NOT MERGE. may fix build on some version of gcc
* commit '
9ee3975883cc4356d7b44f4e86d8c61589d2f42c':
DO NOT MERGE. may fix build on some version of gcc
Dianne Hackborn [Tue, 14 Jun 2011 22:21:18 +0000 (15:21 -0700)]
am
8a73d211: am
74c48f2b: am
700a1f25: Merge "Update resources documentation with new qualifiers." into honeycomb-mr2
* commit '
8a73d211845671880b0d50fbb0c5caa065066c80':
Update resources documentation with new qualifiers.
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
Dianne Hackborn [Tue, 14 Jun 2011 22:05:46 +0000 (15:05 -0700)]
Merge "resolved conflicts for merge of
77fc8b80 to master"
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
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:48:51 +0000 (14:48 -0700)]
am
fbef26eb: Merge "Enforce provision check for CSIM record only." into honeycomb-LTE
* commit '
fbef26eb55cf8a5b5a25a2b748bf16b54d398abc':
Enforce provision check for CSIM record only.
Wink Saville [Tue, 14 Jun 2011 21:47:07 +0000 (14:47 -0700)]
am
c2d17d3b: Merge "Make APN re-connect delay configuable" into honeycomb-LTE
* commit '
c2d17d3bea02991df378237ea7058ccedb7c6a14':
Make APN re-connect delay configuable
Wink Saville [Tue, 14 Jun 2011 21:47:04 +0000 (14:47 -0700)]
am
82c1a5de: Merge "Revert "CDMALTE: Get roaming status based on SID/NID"" into honeycomb-LTE
* commit '
82c1a5dea305d56eb77efa7d9a730307ff6af28a':
Revert "CDMALTE: Get roaming status based on SID/NID"
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
Jamie Gennis [Tue, 14 Jun 2011 21:15:11 +0000 (14:15 -0700)]
Merge changes I47f147f8,Id09915c9,Iabc6d27c
* changes:
SurfaceTexture: increase the test's Surface layer.
SurfaceTexture: add some RGBA_8888 tests.
SurfaceTextureClient: minor test refactoring.
Adam Powell [Tue, 14 Jun 2011 20:47:45 +0000 (13:47 -0700)]
Merge "Fix bug
4551701 - com.android.browser: java.lang.IllegalStateException"
Jamie Gennis [Tue, 14 Jun 2011 02:06:52 +0000 (19:06 -0700)]
SurfaceTexture: increase the test's Surface layer.
This change increases the Surface layer used for displaying the test
results so that the tests will be visible over other windows in the
system.
Change-Id: I47f147f8743ff2a39d57d551811668371202bd31
OSDN Git Service
