OSDN Git Service
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.
Andreas Huber [Tue, 1 Nov 2011 15:30:54 +0000 (08:30 -0700)]
Merge "Support new HLS byte-range extensions"
Nick Pelly [Tue, 1 Nov 2011 05:09:10 +0000 (22:09 -0700)]
Merge "API Change: add isNdefPushEnabled() & ACTION_NFC_SETTINGS."
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
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
Joe Fernandez [Sat, 29 Oct 2011 02:16:10 +0000 (02:16 +0000)]
am
09848bc8: Merge "docs: add developer guide cross references, Project ACRE, round 3" into ics-mr0
* commit '
09848bc89de999416e2de82a7693b2deec6bf802':
docs: add developer guide cross references, Project ACRE, round 3
Justin Ho [Sat, 29 Oct 2011 02:16:08 +0000 (02:16 +0000)]
am
c1cf3b16: Merge "Vertically center the landscape navigation bar." into ics-mr0
* commit '
c1cf3b160b4852e021a45806d496a9f9a76d6683':
Vertically center the landscape navigation bar.
Amith Yamasani [Sat, 29 Oct 2011 01:59:11 +0000 (18:59 -0700)]
Merge "Bring back the old-style Ring/Vibrate/Silent states when using volume keys." into ics-mr0
satok [Sat, 29 Oct 2011 01:26:40 +0000 (18:26 -0700)]
Merge "Add a flag for recommended suggestions of the spell checker" into ics-mr1
satok [Sat, 29 Oct 2011 01:25:28 +0000 (18:25 -0700)]
Merge "Hide ime switcher when the screen is turned off." into ics-mr1
Jeff Brown [Sat, 29 Oct 2011 01:21:05 +0000 (18:21 -0700)]
Merge "Improve the slow query instrumentation." into ics-mr0
Dianne Hackborn [Sat, 29 Oct 2011 00:33:39 +0000 (17:33 -0700)]
Merge "Add some IO tests." into ics-mr1
Eric Fischer [Sat, 29 Oct 2011 00:29:12 +0000 (17:29 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
Svetoslav Ganov [Fri, 28 Oct 2011 23:42:06 +0000 (16:42 -0700)]
Merge "Fixing the build breakage due to bad merge."
Peter Ng [Fri, 28 Oct 2011 23:09:36 +0000 (16:09 -0700)]
resolved conflicts for merge of
e10462e3 to master
Change-Id: I1c5a4fd1573583cd365b375835038e7e4a34f201
Scott Main [Fri, 28 Oct 2011 22:57:45 +0000 (15:57 -0700)]
Merge "docs: fix spell checker client location" into ics-mr0
Peter Ng [Fri, 28 Oct 2011 22:44:18 +0000 (22:44 +0000)]
am
146d018f: Merge "Checkbox and radio button assets are sharper and blue" into ics-mr1
* commit '
146d018f2083ec435ad76c18302cd9e2496ef4d8':
Checkbox and radio button assets are sharper and blue
Chet Haase [Fri, 28 Oct 2011 22:44:16 +0000 (22:44 +0000)]
am
d568bba5: Merge "Optimize handling of scrolled wallpapers" into ics-mr1
* commit '
d568bba507b0f66d4d57c67b08ade894d2c75e53':
Optimize handling of scrolled wallpapers
Svetoslav Ganov [Fri, 28 Oct 2011 22:40:32 +0000 (15:40 -0700)]
resolved conflicts for merge of
c00d2ddc to master
Change-Id: I075cc5b5df2909152ee463f8a0c7534344b47c62
Joe Fernandez [Fri, 28 Oct 2011 22:40:11 +0000 (15:40 -0700)]
Merge "docs: add developer guide cross references, Project ACRE, round 3" into ics-mr0
Eric Fischer [Fri, 28 Oct 2011 22:27:54 +0000 (22:27 +0000)]
am
220d2b0a: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
220d2b0aa126fbe09dee9e7e9afa1999521cf5d2':
Import revised translations. DO NOT MERGE
Gilles Debunne [Fri, 28 Oct 2011 22:27:50 +0000 (22:27 +0000)]
am
a068e2f1: am
4eec98ed: Merge "Text handles do not handle scroll correctly" into ics-mr0
* commit '
a068e2f1d9532e6f005a162adfa295c553873ca5':
Text handles do not handle scroll correctly
The Android Open Source Project [Fri, 28 Oct 2011 22:27:47 +0000 (22:27 +0000)]
am
58ba1b61: Reconcile with ics-mr0-release
* commit '
58ba1b6121a9f11bc1ba40eb5b267033bbf2fafb':
Revert "Clean up CursorWindow code."
Revert "Restore broken CursorWindow.getType behavior."
Revert "Clean up CursorWindow lifetime."
Revert "Fix regression in CursorWindow.copyStingToBuffer."
Revert "Fix regression in CursorWindow.getString()"
Revert "Clean up handrolled Binder proxies."
Revert "Fix ownership of CursorWindows across processes."
Revert "Use ashmem for CursorWindows."
Jeff Sharkey [Fri, 28 Oct 2011 22:27:38 +0000 (22:27 +0000)]
am
cc16024f: Merge "Differentiate between system_server and unknown." into ics-mr1
* commit '
cc16024f101c0fca211fcd069b3917becf7a3c00':
Differentiate between system_server and unknown.
Daniel Sandler [Fri, 28 Oct 2011 22:27:37 +0000 (22:27 +0000)]
am
4c7926fa: Merge "Tuning parameters for mobile RSSI." into ics-mr1
* commit '
4c7926fa27dacb92c8c7f3d57c4a3713dc0e3867':
Tuning parameters for mobile RSSI.
Raphael [Fri, 28 Oct 2011 22:27:22 +0000 (22:27 +0000)]
am
48ba4139: (-s ours) am
fe9a2a54: (-s ours) Cherry-pick
f51125d from master to ics-mr0. do not merge.
* commit '
48ba4139b9dc1f53f996b71f509a9d0c6fd2d72b':
Cherry-pick
f51125d from master to ics-mr0. do not merge.
Peter Ng [Fri, 28 Oct 2011 22:27:13 +0000 (22:27 +0000)]
am
63dd319e: Merge "Lockscreen on tablet is now using the same waveview widget as phone" into ics-mr1
* commit '
63dd319ebeea0421f8bf901b85b753dde1de74d7':
Lockscreen on tablet is now using the same waveview widget as phone
Adam Powell [Fri, 28 Oct 2011 22:27:12 +0000 (22:27 +0000)]
am
65793dc0: Merge "Add API for deferring fragment start." into ics-mr1
* commit '
65793dc043eee43790137f79beeba7ed8b123902':
Add API for deferring fragment start.
Gilles Debunne [Fri, 28 Oct 2011 22:26:22 +0000 (15:26 -0700)]
Merge "Performance improvement in TextView"
Gilles Debunne [Fri, 28 Oct 2011 22:26:07 +0000 (15:26 -0700)]
Merge changes I2082e3d0,Ibf8e9827
* changes:
Scroll performance improved in multiline TextEdit
Performance improvements for long text edition.
Peter Ng [Fri, 28 Oct 2011 22:20:56 +0000 (15:20 -0700)]
Merge "Stat_notify visual asset updates" into ics-mr1
Peter Ng [Fri, 28 Oct 2011 22:20:27 +0000 (15:20 -0700)]
Merge "Checkbox and radio button assets are sharper and blue" into ics-mr1
Mark Wagner [Fri, 28 Oct 2011 22:16:37 +0000 (15:16 -0700)]
Merge "bugfix
5513340 Insertion pointer (vertical beam) behaves oddly in Talk's message composition field"
Chet Haase [Fri, 28 Oct 2011 22:13:27 +0000 (15:13 -0700)]
Merge "Optimize handling of scrolled wallpapers" into ics-mr1
Justin Ho [Fri, 28 Oct 2011 22:01:19 +0000 (15:01 -0700)]
Merge "Vertically center the landscape navigation bar." into ics-mr0
Jeff Brown [Fri, 28 Oct 2011 04:24:54 +0000 (21:24 -0700)]
Improve the slow query instrumentation.
On user-debug and eng builds, you can set the
"db.log.slow_query_threshold" system property to queries that
take longer than the specified number of milliseconds.
Set it to 0 to log all queries.
This property has been around for a while but it was implemented
poorly. In particular, it *changed* the behavior of the query
by calling getCount() while holding the Db connection.
In normal operation, the query will not actually run until later.
By putting the timing logic into fillWindow() instead, we ensure
that we only measure queries that actually ran. We also capture
cases where the cursor window gets filled multiple times.
Bug:
5520301
Change-Id: I174f5e1ea15831a1d22a36e9a804d7755f230b38
Svetoslav Ganov [Fri, 28 Oct 2011 21:20:52 +0000 (14:20 -0700)]
Merge "Fixing a memory leak in accessibility enteraction APIs." into ics-mr1
Eric Fischer [Fri, 28 Oct 2011 20:59:31 +0000 (13:59 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Gilles Debunne [Fri, 28 Oct 2011 20:44:17 +0000 (20:44 +0000)]
am
4eec98ed: Merge "Text handles do not handle scroll correctly" into ics-mr0
* commit '
4eec98edee3d6eb516e30a7151da13fd726f93a9':
Text handles do not handle scroll correctly
Gilles Debunne [Fri, 28 Oct 2011 20:41:01 +0000 (13:41 -0700)]
Merge "Text handles do not handle scroll correctly" into ics-mr0
The Android Open Source Project [Fri, 28 Oct 2011 20:05:26 +0000 (13:05 -0700)]
Reconcile with ics-mr0-release
Change-Id: I6997b52967863156cd151e368e891b63024ebbb1
Jeff Sharkey [Fri, 28 Oct 2011 19:24:44 +0000 (12:24 -0700)]
Merge "Differentiate between system_server and unknown." into ics-mr1
Daniel Sandler [Fri, 28 Oct 2011 19:21:22 +0000 (12:21 -0700)]
Merge "Tuning parameters for mobile RSSI." into ics-mr1
Eric Fischer [Fri, 28 Oct 2011 19:10:44 +0000 (12:10 -0700)]
Merge "Import revised translations."
Glenn Kasten [Fri, 28 Oct 2011 18:57:56 +0000 (11:57 -0700)]
Merge "Bug
5522189 temporary workaround"
Raphael [Fri, 28 Oct 2011 18:54:36 +0000 (18:54 +0000)]
am
fe9a2a54: (-s ours) Cherry-pick
f51125d from master to ics-mr0. do not merge.
* commit '
fe9a2a5471616a3267b30013bce36b13a455c0cd':
Cherry-pick
f51125d from master to ics-mr0. do not merge.
Jeff Brown [Fri, 28 Oct 2011 18:52:01 +0000 (11:52 -0700)]
Merge "Optimize fillWindow to improve reverse-seek performance. Bug:
5520301"
Xavier Ducrohet [Fri, 28 Oct 2011 18:28:20 +0000 (11:28 -0700)]
Merge "AAPT fix printf %zd crash on Windows."
Peter Ng [Fri, 28 Oct 2011 17:53:54 +0000 (10:53 -0700)]
Merge "Lockscreen on tablet is now using the same waveview widget as phone" into ics-mr1
OSDN Git Service
