OSDN Git Service
Mangesh Ghiware [Wed, 2 Nov 2011 17:31:38 +0000 (17:31 +0000)]
am
274133df: Merge "Fix setInitialScale() to take display density into account." into ics-mr1
* commit '
274133dfef84f93de349fcd34919f4df32279e8a':
Fix setInitialScale() to take display density into account.
Eric Fischer [Wed, 2 Nov 2011 17:31:35 +0000 (17:31 +0000)]
am
abf75396: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
abf7539642a7c3d8d31c1d12d705b54cf155db1a':
Import revised translations. DO NOT MERGE
Michael Jurka [Wed, 2 Nov 2011 17:31:33 +0000 (17:31 +0000)]
am
93430b3c: Merge "Fix: never show recents over lock screen" into ics-mr1
* commit '
93430b3c6d170bf1db538c21666e0b508e8e48ec':
Fix: never show recents over lock screen
Peter Ng [Wed, 2 Nov 2011 17:31:15 +0000 (17:31 +0000)]
am
80c3c87f: Merge "Asset updates for tablet notifications and layout fixes to quicksettings" into ics-mr1
* commit '
80c3c87ff08e77c3bcbd14f003e296bed9adba55':
Asset updates for tablet notifications and layout fixes to quicksettings
Fabrice Di Meglio [Wed, 2 Nov 2011 17:31:07 +0000 (17:31 +0000)]
am
3b8d33b1: (-s ours) Merge "Fix bug #
5504346 Hung in native_getTextRunAdvances - DO NOT MERGE" into ics-mr1
* commit '
3b8d33b131956f3a1b41c15dbe07b1b2d7f44086':
Fix bug #
5504346 Hung in native_getTextRunAdvances - DO NOT MERGE
Robert Greenwalt [Wed, 2 Nov 2011 17:31:06 +0000 (17:31 +0000)]
am
852d72b2: am
bd9b1528: Merge "Add cdma_rmnet4 to list of monitored interfaces" into ics-mr0
* commit '
852d72b28e6d7d0e6372a9b544641817338002e6':
Add cdma_rmnet4 to list of monitored interfaces
Daniel Sandler [Wed, 2 Nov 2011 17:30:42 +0000 (17:30 +0000)]
am
7775f52e: Merge "Bring timestamps back to notifications." into ics-mr1
* commit '
7775f52e4aa7703a5721378f5a1103d9486af895':
Bring timestamps back to notifications.
Jim Miller [Wed, 2 Nov 2011 17:30:40 +0000 (17:30 +0000)]
am
a67217c3: Merge "Fix
5404916: Make layout fit on 480x800 hdpi device" into ics-mr1
* commit '
a67217c35ec43e06598b71feae63ce675fa9cac7':
Fix
5404916: Make layout fit on 480x800 hdpi device
Fabrice Di Meglio [Wed, 2 Nov 2011 17:30:39 +0000 (17:30 +0000)]
am
deb15704: (-s ours) am
46e327ca: (-s ours) Merge "Fix bug #
5504346 Hung in native_getTextRunAdvances - DO NOT MERGE" into ics-mr0
* commit '
deb15704e9abcfc71bb81a358ff3bb239896474d':
Fix bug #
5504346 Hung in native_getTextRunAdvances - DO NOT MERGE
Mangesh Ghiware [Wed, 2 Nov 2011 17:30:34 +0000 (17:30 +0000)]
am
00ef15b9: Merge "Clamp initial scale between minimum and maximum values." into ics-mr1
* commit '
00ef15b98ac0579ebd5f81a1753bc18384e88b8b':
Clamp initial scale between minimum and maximum values.
Adam Powell [Wed, 2 Nov 2011 17:30:29 +0000 (17:30 +0000)]
am
ca4100da: Merge "Fix bug
5534667 - Action bar icons need more space on tablet" into ics-mr1
* commit '
ca4100da0a0481b3b9f464bbc8842b571e8c60d5':
Fix bug
5534667 - Action bar icons need more space on tablet
Dianne Hackborn [Wed, 2 Nov 2011 17:30:26 +0000 (17:30 +0000)]
am
f136aa34: Merge "Various performance and other work." into ics-mr1
* commit '
f136aa341abaaf7fd6f7632d41a30b2989d93985':
Various performance and other work.
Peter Ng [Wed, 2 Nov 2011 17:30:25 +0000 (17:30 +0000)]
am
374e23bd: Merge "spinner focused states pumped up" into ics-mr1
* commit '
374e23bd11c42e7e472d2490a3dfddb7df198a66':
spinner focused states pumped up
The Android Open Source Project [Wed, 2 Nov 2011 17:30:20 +0000 (17:30 +0000)]
am
a0824452: am
9eb4c891: Reconcile with ics-factoryrom-2-release
* commit '
a0824452d5c511acc7d11396ff2e6423f7b03948':
Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
Philip Milne [Wed, 2 Nov 2011 17:30:11 +0000 (17:30 +0000)]
am
3617933b: Merge " Update to fix for bug
5393156" into ics-mr1
* commit '
3617933bee5a977a7e6c8f8f4b75e580f8bf2ebf':
Update to fix for bug
5393156
Jim Miller [Wed, 2 Nov 2011 17:29:49 +0000 (17:29 +0000)]
am
22726020: am
1dce37bd: Merge "Fix
5497305: Make sure we show SIM unlock when "None" is selected" into ics-mr0
* commit '
2272602032e5051d5067a7a95c741304468a81af':
Fix
5497305: Make sure we show SIM unlock when "None" is selected
Chih-Chung Chang [Wed, 2 Nov 2011 17:29:46 +0000 (17:29 +0000)]
am
11ba6da4: am
4b6353ea: Merge "Update camera continuous autofocus javadoc." into ics-mr0
* commit '
11ba6da460572b9ce9cb9dc0d5a76b710e7efdb3':
Update camera continuous autofocus javadoc.
satok [Wed, 2 Nov 2011 17:29:35 +0000 (17:29 +0000)]
am
ff93e417: Merge "Resolve memory leak in TextServicesManagerService" into ics-mr1
* commit '
ff93e417a217703a635d8601b835853e07233afd':
Resolve memory leak in TextServicesManagerService
Adam Powell [Wed, 2 Nov 2011 17:29:33 +0000 (17:29 +0000)]
am
b1db20bd: Merge "Fix bug
5514022 - ListView should not auto-scroll selected item to top when gaining focus" into ics-mr1
* commit '
b1db20bde5e00c8cdd1a97b07ddcc41f321d3db8':
Fix bug
5514022 - ListView should not auto-scroll selected item to top when gaining focus
Stephen Hines [Wed, 2 Nov 2011 17:29:30 +0000 (17:29 +0000)]
am
af3a854b: am
af675222: Merge "Fix potential segfault in RS watchdog." into ics-mr0
* commit '
af3a854b549409c4ad77c686e860f97ea86706a0':
Fix potential segfault in RS watchdog.
Fabrice Di Meglio [Wed, 2 Nov 2011 00:25:22 +0000 (17:25 -0700)]
Merge "Fix bug #
5438102 Double Arabic harakat overlap instead of stack In TextView"
Eric Laurent [Tue, 1 Nov 2011 21:59:18 +0000 (21:59 +0000)]
am
cd84197a: am
6e91e5b6: Merge "Fix volume indication in vibrate mode." into ics-mr0
* commit '
cd84197ac1226432de2e13c8fd678a4c88511e0f':
Fix volume indication in vibrate mode.
Martijn Coenen [Tue, 1 Nov 2011 21:59:16 +0000 (21:59 +0000)]
am
b288f993: am
1eca250b: Merge "Fix disableForegroundNdefPush crash." into ics-mr0
* commit '
b288f99334348a21ffb465b37a4522998b452410':
Fix disableForegroundNdefPush crash.
Pannag Sanketi [Tue, 1 Nov 2011 21:59:09 +0000 (21:59 +0000)]
am
dd79b4c8: Merge "Expose video stabilization API" into ics-mr1
* commit '
dd79b4c85a9dd2c2ad702ea2137fe2a076567fa1':
Expose video stabilization API
Svetoslav Ganov [Tue, 1 Nov 2011 21:58:52 +0000 (21:58 +0000)]
am
62015f5d: am
aeb11b59: Merge "Folding Accessibility Service sample into ApiDemos." into ics-mr0
* commit '
62015f5d0d1104dfc682b3eb3b6c0be4f63b985a':
Folding Accessibility Service sample into ApiDemos.
Mangesh Ghiware [Tue, 1 Nov 2011 21:02:05 +0000 (14:02 -0700)]
Merge "Fix setInitialScale() to take display density into account." into ics-mr1
Eric Fischer [Tue, 1 Nov 2011 20:53:14 +0000 (13:53 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Michael Jurka [Tue, 1 Nov 2011 20:53:02 +0000 (13:53 -0700)]
Merge "Fix: never show recents over lock screen" into ics-mr1
Peter Ng [Tue, 1 Nov 2011 20:45:18 +0000 (13:45 -0700)]
Merge "Asset updates for tablet notifications and layout fixes to quicksettings" into ics-mr1
Fabrice Di Meglio [Tue, 1 Nov 2011 20:30:24 +0000 (13:30 -0700)]
Merge "Fix bug #
5504346 Hung in native_getTextRunAdvances - DO NOT MERGE" into ics-mr1
Robert Greenwalt [Tue, 1 Nov 2011 20:29:42 +0000 (20:29 +0000)]
am
bd9b1528: Merge "Add cdma_rmnet4 to list of monitored interfaces" into ics-mr0
* commit '
bd9b1528051a1b257768fdbc5077a2d4473b02dd':
Add cdma_rmnet4 to list of monitored interfaces
Robert Greenwalt [Tue, 1 Nov 2011 20:27:56 +0000 (13:27 -0700)]
Merge "Add cdma_rmnet4 to list of monitored interfaces" into ics-mr0
Daniel Sandler [Tue, 1 Nov 2011 20:05:41 +0000 (13:05 -0700)]
Merge "Bring timestamps back to notifications." into ics-mr1
Jim Miller [Tue, 1 Nov 2011 19:45:11 +0000 (12:45 -0700)]
Merge "Fix
5404916: Make layout fit on 480x800 hdpi device" into ics-mr1
Fabrice Di Meglio [Tue, 1 Nov 2011 19:42:48 +0000 (19:42 +0000)]
am
46e327ca: (-s ours) Merge "Fix bug #
5504346 Hung in native_getTextRunAdvances - DO NOT MERGE" into ics-mr0
* commit '
46e327ca32a29432941ba4487077577b10243aed':
Fix bug #
5504346 Hung in native_getTextRunAdvances - DO NOT MERGE
Fabrice Di Meglio [Tue, 1 Nov 2011 19:41:04 +0000 (12:41 -0700)]
Merge "Fix bug #
5504346 Hung in native_getTextRunAdvances - DO NOT MERGE" into ics-mr0
Mangesh Ghiware [Tue, 1 Nov 2011 18:28:01 +0000 (11:28 -0700)]
Merge "Clamp initial scale between minimum and maximum values." into ics-mr1
Adam Powell [Tue, 1 Nov 2011 17:58:58 +0000 (10:58 -0700)]
Merge "Fix bug
5534667 - Action bar icons need more space on tablet" into ics-mr1
Dianne Hackborn [Tue, 1 Nov 2011 17:42:54 +0000 (10:42 -0700)]
Merge "Various performance and other work." into ics-mr1
Peter Ng [Tue, 1 Nov 2011 17:29:25 +0000 (10:29 -0700)]
Merge "spinner focused states pumped up" into ics-mr1
The Android Open Source Project [Tue, 1 Nov 2011 17:10:39 +0000 (17:10 +0000)]
am
9eb4c891: Reconcile with ics-factoryrom-2-release
* commit '
9eb4c891a3db118f2546af7593c6251f3210f3ef':
Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
The Android Open Source Project [Tue, 1 Nov 2011 17:08:14 +0000 (10:08 -0700)]
Reconcile with ics-factoryrom-2-release
Change-Id: I82d01dc0c40aeeafc6b10fd1d4bf1464a2f02254
Philip Milne [Tue, 1 Nov 2011 16:30:21 +0000 (09:30 -0700)]
Merge " Update to fix for bug
5393156" into ics-mr1
Andreas Huber [Tue, 1 Nov 2011 15:30:54 +0000 (08:30 -0700)]
Merge "Support new HLS byte-range extensions"
Jim Miller [Tue, 1 Nov 2011 07:49:46 +0000 (07:49 +0000)]
am
1dce37bd: Merge "Fix
5497305: Make sure we show SIM unlock when "None" is selected" into ics-mr0
* commit '
1dce37bd6bb9b3fe555342f9d2c52e60e10a3fea':
Fix
5497305: Make sure we show SIM unlock when "None" is selected
Jim Miller [Tue, 1 Nov 2011 07:47:44 +0000 (00:47 -0700)]
Merge "Fix
5497305: Make sure we show SIM unlock when "None" is selected" into ics-mr0
Nick Pelly [Tue, 1 Nov 2011 05:09:10 +0000 (22:09 -0700)]
Merge "API Change: add isNdefPushEnabled() & ACTION_NFC_SETTINGS."
Chih-Chung Chang [Tue, 1 Nov 2011 04:05:45 +0000 (04:05 +0000)]
am
4b6353ea: Merge "Update camera continuous autofocus javadoc." into ics-mr0
* commit '
4b6353ea0265bfed52d0637abd1b17596ce25ff0':
Update camera continuous autofocus javadoc.
Chih-Chung Chang [Tue, 1 Nov 2011 04:04:01 +0000 (21:04 -0700)]
Merge "Update camera continuous autofocus javadoc." into ics-mr0
satok [Tue, 1 Nov 2011 01:20:48 +0000 (18:20 -0700)]
Merge "Resolve memory leak in TextServicesManagerService" into ics-mr1
Adam Powell [Tue, 1 Nov 2011 01:18:33 +0000 (18:18 -0700)]
Merge "Fix bug
5514022 - ListView should not auto-scroll selected item to top when gaining focus" into ics-mr1
Gilles Debunne [Tue, 1 Nov 2011 00:25:08 +0000 (17:25 -0700)]
Merge "No threading issues in SpellChecker."
Stephen Hines [Tue, 1 Nov 2011 00:16:56 +0000 (00:16 +0000)]
am
af675222: Merge "Fix potential segfault in RS watchdog." into ics-mr0
* commit '
af675222f6340a8a9edbe9e8635014a18521e5e0':
Fix potential segfault in RS watchdog.
Stephen Hines [Tue, 1 Nov 2011 00:14:58 +0000 (17:14 -0700)]
Merge "Fix potential segfault in RS watchdog." into ics-mr0
The Android Automerger [Mon, 31 Oct 2011 23:47:11 +0000 (16:47 -0700)]
Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
This reverts commit
2d280f754e32e556407df05d977cfabdfff1c070, reversing
changes made to
2cc1c5d067736f221554be593c2ba2c96390f847.
Eric Laurent [Mon, 31 Oct 2011 23:23:15 +0000 (23:23 +0000)]
am
6e91e5b6: Merge "Fix volume indication in vibrate mode." into ics-mr0
* commit '
6e91e5b689a3eb8e6a6f3c038322b8044a9d6670':
Fix volume indication in vibrate mode.
Eric Laurent [Mon, 31 Oct 2011 23:21:16 +0000 (16:21 -0700)]
Merge "Fix volume indication in vibrate mode." into ics-mr0
Martijn Coenen [Mon, 31 Oct 2011 22:54:43 +0000 (22:54 +0000)]
am
1eca250b: Merge "Fix disableForegroundNdefPush crash." into ics-mr0
* commit '
1eca250b9dad45893fead128539f112cbc513496':
Fix disableForegroundNdefPush crash.
Fabrice Di Meglio [Mon, 31 Oct 2011 22:53:54 +0000 (15:53 -0700)]
Merge "Fix bug #
5504346 Hung in native_getTextRunAdvances"
Martijn Coenen [Mon, 31 Oct 2011 22:53:08 +0000 (15:53 -0700)]
Merge "Fix disableForegroundNdefPush crash." into ics-mr0
The Android Open Source Project [Mon, 31 Oct 2011 22:13:43 +0000 (22:13 +0000)]
am
d59daca8: Reconcile with ics-mr0-release
* commit '
d59daca890329fb6aee434cacd1136f40e9e487a':
Tom Taylor [Mon, 31 Oct 2011 22:13:39 +0000 (22:13 +0000)]
am
adfe6383: Merge "NPE in Threads.getOrCreateThreadId(Telephony.java:1275)" into ics-mr1
* commit '
adfe6383ee963b890bfbf319d219a23164804925':
NPE in Threads.getOrCreateThreadId(Telephony.java:1275)
The Android Open Source Project [Mon, 31 Oct 2011 22:13:37 +0000 (22:13 +0000)]
am
d7f36121: am
50d0511d: Reconcile with ics-factoryrom-2-release
* commit '
d7f36121f64fbbfaf640f073e01c43441b149d97':
Revert "Improve the slow query instrumentation."
Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
Adam Powell [Mon, 31 Oct 2011 22:13:33 +0000 (22:13 +0000)]
am
1759af3b: Merge "Bug
5535639 - Monkeys mad at FragmentManager" into ics-mr1
* commit '
1759af3bc8a8f1346e3fb95351ed8037f38526d8':
Bug
5535639 - Monkeys mad at FragmentManager
Winson Chung [Mon, 31 Oct 2011 22:13:26 +0000 (22:13 +0000)]
am
650ee281: Merge "Using fast-invalidate pattern for screenshot animations." into ics-mr1
* commit '
650ee281ae9e007ce82ea79ff18bab9ef49503de':
Using fast-invalidate pattern for screenshot animations.
Marco Nelissen [Mon, 31 Oct 2011 22:13:21 +0000 (22:13 +0000)]
am
6d4b9f0b: Merge "Make MediaController use low profile system UI" into ics-mr1
* commit '
6d4b9f0b409dd15d8ada0a990f9c5785bdbd2e9f':
Make MediaController use low profile system UI
Alex Sakhartchouk [Mon, 31 Oct 2011 22:13:19 +0000 (22:13 +0000)]
am
66ce1fce: Merge "Removing changes not meant for MR1" into ics-mr1
* commit '
66ce1fce59d2dc16f1905120e0fe3851ba1add90':
Removing changes not meant for MR1
Michael Jurka [Mon, 31 Oct 2011 22:13:16 +0000 (22:13 +0000)]
am
b4529b0a: Merge "HorizontalScrollView should delay child presses" into ics-mr1
* commit '
b4529b0adca243644f601c9fe5d419c283bf57c1':
HorizontalScrollView should delay child presses
Amith Yamasani [Mon, 31 Oct 2011 22:13:08 +0000 (22:13 +0000)]
am
18936d7d: am
69e640ee: Merge "Bring back the old-style Ring/Vibrate/Silent states when using volume keys." into ics-mr0
* commit '
18936d7d1d0964ba3f5112c5e3ce60f31e1ba5bb':
Bring back the old-style Ring/Vibrate/Silent states when using volume keys.
Jeff Brown [Mon, 31 Oct 2011 22:10:10 +0000 (15:10 -0700)]
resolved conflicts for merge of
bce45617 to master
Change-Id: Ieb966e674dca3ec46cd3cd25e4de281f1be747c2
Pannag Sanketi [Mon, 31 Oct 2011 22:05:19 +0000 (15:05 -0700)]
Merge "Expose video stabilization API" into ics-mr1
Svetoslav Ganov [Mon, 31 Oct 2011 20:30:30 +0000 (20:30 +0000)]
am
aeb11b59: Merge "Folding Accessibility Service sample into ApiDemos." into ics-mr0
* commit '
aeb11b598877523fd3c530c7a086c38b4a13c7a1':
Folding Accessibility Service sample into ApiDemos.
Svetoslav Ganov [Mon, 31 Oct 2011 20:28:57 +0000 (13:28 -0700)]
Merge "Folding Accessibility Service sample into ApiDemos." into ics-mr0
The Android Open Source Project [Mon, 31 Oct 2011 20:06:22 +0000 (13:06 -0700)]
Reconcile with ics-mr0-release
Change-Id: Ice28e0b55ab17842c9bd01b519b7f4d562822445
Tom Taylor [Mon, 31 Oct 2011 19:51:19 +0000 (12:51 -0700)]
Merge "NPE in Threads.getOrCreateThreadId(Telephony.java:1275)" into ics-mr1
The Android Open Source Project [Mon, 31 Oct 2011 19:45:33 +0000 (19:45 +0000)]
am
50d0511d: Reconcile with ics-factoryrom-2-release
* commit '
50d0511ddbf226255347e95a6382af8b0e7d366b':
Revert "Improve the slow query instrumentation."
Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
The Android Open Source Project [Mon, 31 Oct 2011 19:43:39 +0000 (12:43 -0700)]
Reconcile with ics-factoryrom-2-release
Change-Id: Ic64060bceb7aef3ab5958a8b404e64526f794662
Adam Powell [Mon, 31 Oct 2011 19:37:58 +0000 (12:37 -0700)]
Merge "Bug
5535639 - Monkeys mad at FragmentManager" into ics-mr1
Winson Chung [Mon, 31 Oct 2011 17:54:12 +0000 (10:54 -0700)]
Merge "Using fast-invalidate pattern for screenshot animations." into ics-mr1
Marco Nelissen [Mon, 31 Oct 2011 17:46:33 +0000 (10:46 -0700)]
Merge "Make MediaController use low profile system UI" into ics-mr1
Alex Sakhartchouk [Mon, 31 Oct 2011 17:30:37 +0000 (10:30 -0700)]
Merge "Removing changes not meant for MR1" into ics-mr1
Eric Fischer [Mon, 31 Oct 2011 12:26:51 +0000 (12:26 +0000)]
am
94e08f40: (-s ours) am
2cc1c5d0: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '
94e08f40936b6a280f404e8b67cb5ef900747258':
Import revised translations. DO NOT MERGE
Scott Main [Mon, 31 Oct 2011 12:26:33 +0000 (12:26 +0000)]
am
5079909b: am
8dbe177c: Merge "docs: fix spell checker client location" into ics-mr0
* commit '
5079909b8b8fe2e629e0a0b86882e6c15b07ae53':
docs: fix spell checker client location
Joe Fernandez [Mon, 31 Oct 2011 12:26:31 +0000 (12:26 +0000)]
am
74b2b954: am
09848bc8: Merge "docs: add developer guide cross references, Project ACRE, round 3" into ics-mr0
* commit '
74b2b9547329a0b05e0bd5701057696007b854bb':
docs: add developer guide cross references, Project ACRE, round 3
Justin Ho [Mon, 31 Oct 2011 12:26:30 +0000 (12:26 +0000)]
am
76756a42: am
c1cf3b16: Merge "Vertically center the landscape navigation bar." into ics-mr0
* commit '
76756a42dd68062349158f70d9b0ab95db908acc':
Vertically center the landscape navigation bar.
satok [Mon, 31 Oct 2011 12:26:23 +0000 (12:26 +0000)]
am
4a6d0879: Merge "Add a flag for recommended suggestions of the spell checker" into ics-mr1
* commit '
4a6d0879465ea6eb52b2b75e9fa2a4a84e1b0d86':
Add a flag for recommended suggestions of the spell checker
satok [Mon, 31 Oct 2011 12:26:21 +0000 (12:26 +0000)]
am
f0fd595f: Merge "Hide ime switcher when the screen is turned off." into ics-mr1
* commit '
f0fd595f0f3203fb81cb39a367b2a06647db907d':
Hide ime switcher when the screen is turned off.
Dianne Hackborn [Mon, 31 Oct 2011 12:26:19 +0000 (12:26 +0000)]
am
7801612b: Merge "Add some IO tests." into ics-mr1
* commit '
7801612b4f66e3c9cf58d24cffa8ce72e43adc57':
Add some IO tests.
Dianne Hackborn [Mon, 31 Oct 2011 12:26:15 +0000 (12:26 +0000)]
am
e02c88af: Work on process management.
* commit '
e02c88af7935c72fb90a478375e61e4a94465587':
Work on process management.
Adam Powell [Mon, 31 Oct 2011 12:26:08 +0000 (12:26 +0000)]
am
678ed0c5: Bug
5275928 - Don\'t try to open an overflow menu under invalid circumstances.
* commit '
678ed0c5a32bac1ea18a5ac99b0b814421ea79b4':
Bug
5275928 - Don't try to open an overflow menu under invalid circumstances.
Michael Jurka [Mon, 31 Oct 2011 02:41:24 +0000 (19:41 -0700)]
Merge "HorizontalScrollView should delay child presses" into ics-mr1
Amith Yamasani [Sun, 30 Oct 2011 21:37:09 +0000 (21:37 +0000)]
am
69e640ee: Merge "Bring back the old-style Ring/Vibrate/Silent states when using volume keys." into ics-mr0
* commit '
69e640ee84fc218d6318acaf73a1c1841d7fba6b':
Bring back the old-style Ring/Vibrate/Silent states when using volume keys.
Jeff Brown [Sun, 30 Oct 2011 21:24:02 +0000 (14:24 -0700)]
resolved conflicts for merge of
2d280f75 to ics-mr1
Change-Id: I459e1cb0b60fb94dfb12862fedb9f8d949c226a7
The Android Automerger [Sun, 30 Oct 2011 20:56:11 +0000 (13:56 -0700)]
Revert "Improve the slow query instrumentation."
This reverts commit
89101cd9d9b5c1a6ff1ed85eba0613ca4c4802e2.
The Android Automerger [Sun, 30 Oct 2011 19:35:09 +0000 (12:35 -0700)]
merge in ics-factoryrom-2-release history after reset to ics-mr0
The Android Automerger [Sun, 30 Oct 2011 13:29:10 +0000 (06:29 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
Jesse Wilson [Sat, 29 Oct 2011 17:14:34 +0000 (10:14 -0700)]
Merge "Interpret '+' as a space char in the URL query params."
The Android Automerger [Sat, 29 Oct 2011 03:40:07 +0000 (20:40 -0700)]
Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
This reverts commit
2d280f754e32e556407df05d977cfabdfff1c070, reversing
changes made to
2cc1c5d067736f221554be593c2ba2c96390f847.
Eric Fischer [Sat, 29 Oct 2011 03:15:36 +0000 (03:15 +0000)]
am
2cc1c5d0: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '
2cc1c5d067736f221554be593c2ba2c96390f847':
Import revised translations. DO NOT MERGE
Scott Main [Sat, 29 Oct 2011 02:16:15 +0000 (02:16 +0000)]
am
8dbe177c: Merge "docs: fix spell checker client location" into ics-mr0
* commit '
8dbe177c5dda205086f7a353dd1fa09a0c7ab24c':
docs: fix spell checker client location
OSDN Git Service
