OSDN Git Service
Roman Nurik [Thu, 1 Dec 2011 21:44:41 +0000 (13:44 -0800)]
am
a7d825dd: am
c3998ced: Merge "Update widget design guidelines for padding and 8dp." into ics-mr0
* commit '
a7d825dddcb2e8bfd765bad2fb406498f4f1e37e':
Update widget design guidelines for padding and 8dp.
Roman Nurik [Thu, 1 Dec 2011 21:42:23 +0000 (13:42 -0800)]
am
c3998ced: Merge "Update widget design guidelines for padding and 8dp." into ics-mr0
* commit '
c3998ced746ee97bc5f10a9de1b2848f85c8711e':
Update widget design guidelines for padding and 8dp.
Roman Nurik [Thu, 1 Dec 2011 21:40:38 +0000 (13:40 -0800)]
Merge "Update widget design guidelines for padding and 8dp." into ics-mr0
Matthew Xie [Thu, 1 Dec 2011 21:34:18 +0000 (13:34 -0800)]
am
1a1be44c: Merge "Unlink the Binder DeathRecipient when removing a Bluetooth service record" into ics-mr1
* commit '
1a1be44c5bf1e6099d678c81ef5e9326cabcb3df':
Unlink the Binder DeathRecipient when removing a Bluetooth service record
Matthew Xie [Thu, 1 Dec 2011 21:32:19 +0000 (13:32 -0800)]
Merge "Unlink the Binder DeathRecipient when removing a Bluetooth service record" into ics-mr1
Svetoslav Ganov [Thu, 1 Dec 2011 20:59:11 +0000 (12:59 -0800)]
am
e9f24a43: Merge "Fix memory leaks in the accessibility layer." into ics-mr1
* commit '
e9f24a43021734d28a4f65ebc804847b31ce13e8':
Fix memory leaks in the accessibility layer.
Svetoslav Ganov [Thu, 1 Dec 2011 20:57:12 +0000 (12:57 -0800)]
Merge "Fix memory leaks in the accessibility layer." into ics-mr1
Dianne Hackborn [Thu, 1 Dec 2011 20:49:38 +0000 (12:49 -0800)]
am
55e81bd0: Merge "Improve how we manage the previous app." into ics-mr1
* commit '
55e81bd0f219acbe00bbeebc8d33ef9c67a4aa60':
Improve how we manage the previous app.
Dianne Hackborn [Thu, 1 Dec 2011 20:47:43 +0000 (12:47 -0800)]
Merge "Improve how we manage the previous app." into ics-mr1
Daniel Sandler [Thu, 1 Dec 2011 20:11:23 +0000 (12:11 -0800)]
am
b73dc9c8: Merge "Add copious navigation bar info to SystemUI dumps." into ics-mr1
* commit '
b73dc9c852f73c7d61f317b5ec7b74766d2f22d5':
Add copious navigation bar info to SystemUI dumps.
Daniel Sandler [Thu, 1 Dec 2011 20:09:51 +0000 (12:09 -0800)]
Merge "Add copious navigation bar info to SystemUI dumps." into ics-mr1
Bill Gruber [Thu, 1 Dec 2011 19:56:55 +0000 (11:56 -0800)]
am
715a3c52: am
92ad16d3: Merge "Cherrypick from HCMR2 Change ID: Id849cb25098fef76c96c4935db31ebc1422d74d8 IAB doc update: CSV import feature Also fixed Bug
5221766" into ics-mr0
* commit '
715a3c52ccd896265b4e57835d196bf7a2a17437':
Cherrypick from HCMR2 Change ID: Id849cb25098fef76c96c4935db31ebc1422d74d8 IAB doc update: CSV import feature Also fixed Bug
5221766
Scott Main [Thu, 1 Dec 2011 19:56:54 +0000 (11:56 -0800)]
am
a8fa89f7: am
8f3993b1: Merge "docs: dashboard update for 12/1" into ics-mr0
* commit '
a8fa89f7f4e658c41dba466b10459208d673bc3a':
docs: dashboard update for 12/1
Bill Gruber [Thu, 1 Dec 2011 19:54:57 +0000 (11:54 -0800)]
am
92ad16d3: Merge "Cherrypick from HCMR2 Change ID: Id849cb25098fef76c96c4935db31ebc1422d74d8 IAB doc update: CSV import feature Also fixed Bug
5221766" into ics-mr0
* commit '
92ad16d342aa4d39bad33600161b3799b84716f3':
Cherrypick from HCMR2 Change ID: Id849cb25098fef76c96c4935db31ebc1422d74d8 IAB doc update: CSV import feature Also fixed Bug
5221766
Scott Main [Thu, 1 Dec 2011 19:54:55 +0000 (11:54 -0800)]
am
8f3993b1: Merge "docs: dashboard update for 12/1" into ics-mr0
* commit '
8f3993b12b52ac5d94d84376ec4f42b130018429':
docs: dashboard update for 12/1
Bill Gruber [Thu, 1 Dec 2011 19:53:23 +0000 (11:53 -0800)]
Merge "Cherrypick from HCMR2 Change ID: Id849cb25098fef76c96c4935db31ebc1422d74d8 IAB doc update: CSV import feature Also fixed Bug
5221766" into ics-mr0
Scott Main [Thu, 1 Dec 2011 19:53:17 +0000 (11:53 -0800)]
Merge "docs: dashboard update for 12/1" into ics-mr0
Amith Yamasani [Thu, 1 Dec 2011 19:37:32 +0000 (11:37 -0800)]
am
e9b0608c: Merge "No clicking on volume icon in volume dialog." into ics-mr1
* commit '
e9b0608c76bd19356f3141358ffdf134b7a9700f':
No clicking on volume icon in volume dialog.
Amith Yamasani [Thu, 1 Dec 2011 19:35:30 +0000 (11:35 -0800)]
Merge "No clicking on volume icon in volume dialog." into ics-mr1
Scott Main [Thu, 1 Dec 2011 19:23:15 +0000 (11:23 -0800)]
am
4f926932: am
acf1038a: docs: remove broken link from renderscript docs bug:
5696178
* commit '
4f9269323b2d8d945d33f9bd79d8b8c3ab6bc3b0':
docs: remove broken link from renderscript docs bug:
5696178
Scott Main [Thu, 1 Dec 2011 19:20:03 +0000 (11:20 -0800)]
am
acf1038a: docs: remove broken link from renderscript docs bug:
5696178
* commit '
acf1038a260d7b2a3bb6b36058da47041c8ec173':
docs: remove broken link from renderscript docs bug:
5696178
Gilles Debunne [Thu, 1 Dec 2011 18:24:23 +0000 (10:24 -0800)]
am
0433c157: Merge "TextViews keep focus after Done" into ics-mr1
* commit '
0433c157141b9122f6c61498e909770f1db27c7c':
TextViews keep focus after Done
Gilles Debunne [Thu, 1 Dec 2011 18:24:21 +0000 (10:24 -0800)]
am
b2aa672f: Merge "Revert "IME action (done, next...) correctly handled"" into ics-mr1
* commit '
b2aa672f24ea0d746f3b96c24e376d5e2c041dc3':
Revert "IME action (done, next...) correctly handled"
Gilles Debunne [Thu, 1 Dec 2011 18:22:15 +0000 (10:22 -0800)]
Merge "TextViews keep focus after Done" into ics-mr1
Gilles Debunne [Thu, 1 Dec 2011 18:21:59 +0000 (10:21 -0800)]
Merge "Revert "IME action (done, next...) correctly handled"" into ics-mr1
Andreas Huber [Thu, 1 Dec 2011 18:20:09 +0000 (10:20 -0800)]
am
2c2ed7be: Merge "Fixes a typo in AVIExtractor that would advertise the wrong video dimensions" into ics-mr1
* commit '
2c2ed7bef931f43dc0701ab723beb0cbed2cb630':
Fixes a typo in AVIExtractor that would advertise the wrong video dimensions
Andreas Huber [Thu, 1 Dec 2011 18:18:19 +0000 (10:18 -0800)]
Merge "Fixes a typo in AVIExtractor that would advertise the wrong video dimensions" into ics-mr1
Robert Greenwalt [Thu, 1 Dec 2011 17:44:12 +0000 (09:44 -0800)]
am
22d5d7b6: Merge "Fix state synchronization problem." into ics-mr1
* commit '
22d5d7b6e865e36eb3e057bc27d339d56c292d20':
Fix state synchronization problem.
Robert Greenwalt [Thu, 1 Dec 2011 17:42:13 +0000 (09:42 -0800)]
Merge "Fix state synchronization problem." into ics-mr1
Ben Murdoch [Thu, 1 Dec 2011 17:05:55 +0000 (09:05 -0800)]
am
90ea4c4d: Merge "Fix crash with HTML5 video." into ics-mr1
* commit '
90ea4c4d30ccafb51e024ab3c34a4655d06eec4c':
Fix crash with HTML5 video.
Ben Murdoch [Thu, 1 Dec 2011 17:03:22 +0000 (09:03 -0800)]
Merge "Fix crash with HTML5 video." into ics-mr1
Daniel Sandler [Thu, 1 Dec 2011 14:31:09 +0000 (06:31 -0800)]
am
2a40d0d9: Merge "Put screensavers back in the icebox for now. DO NOT MERGE." into ics-mr1
* commit '
2a40d0d92b208021b492e9af3d944720cbf269fc':
Put screensavers back in the icebox for now. DO NOT MERGE.
Daniel Sandler [Thu, 1 Dec 2011 14:29:53 +0000 (06:29 -0800)]
Merge "Put screensavers back in the icebox for now. DO NOT MERGE." into ics-mr1
Bart Sears [Thu, 1 Dec 2011 06:31:08 +0000 (22:31 -0800)]
am
41a5774a: Merge "fix position of WebTextView on scrolling layers" into ics-mr1
* commit '
41a5774a99215025628b83db54c45f84b876678e':
fix position of WebTextView on scrolling layers
Bart Sears [Thu, 1 Dec 2011 06:29:16 +0000 (22:29 -0800)]
Merge "fix position of WebTextView on scrolling layers" into ics-mr1
Adam Cohen [Thu, 1 Dec 2011 05:13:04 +0000 (21:13 -0800)]
am
557a1772: Merge "Working around issue where setting min height on RelativeLayout causes items to collapse. (Bug
5640357)" into ics-mr1
* commit '
557a1772f676480da75fff81ff38d6e896fce0a2':
Working around issue where setting min height on RelativeLayout causes items to collapse. (Bug
5640357)
Adam Cohen [Thu, 1 Dec 2011 05:10:27 +0000 (21:10 -0800)]
Merge "Working around issue where setting min height on RelativeLayout causes items to collapse. (Bug
5640357)" into ics-mr1
Dianne Hackborn [Thu, 1 Dec 2011 04:50:57 +0000 (20:50 -0800)]
am
a1240184: Merge "Fix issue #
5433192 and maybe #
5433192" into ics-mr1
* commit '
a1240184efd1d4391540a6e3e9cae50d56d05cb2':
Fix issue #
5433192 and maybe #
5433192
Dianne Hackborn [Thu, 1 Dec 2011 04:49:21 +0000 (20:49 -0800)]
Merge "Fix issue #
5433192 and maybe #
5433192" into ics-mr1
satok [Thu, 1 Dec 2011 01:39:12 +0000 (17:39 -0800)]
am
b94a7fb3: Merge "Fix ConcurrentModificationException in TextServicesManagerService" into ics-mr1
* commit '
b94a7fb3d7483e8b47e4f0229fc7abff10a6572d':
Fix ConcurrentModificationException in TextServicesManagerService
satok [Thu, 1 Dec 2011 01:37:52 +0000 (17:37 -0800)]
Merge "Fix ConcurrentModificationException in TextServicesManagerService" into ics-mr1
Svetoslav Ganov [Thu, 1 Dec 2011 00:59:46 +0000 (16:59 -0800)]
am
d8ec8db5: Merge "Fixing memory leaks in the accessiiblity layer." into ics-mr1
* commit '
d8ec8db5e0f227e4f63e948acb78d829f5ad30c8':
Fixing memory leaks in the accessiiblity layer.
Svetoslav Ganov [Thu, 1 Dec 2011 00:56:41 +0000 (16:56 -0800)]
Merge "Fixing memory leaks in the accessiiblity layer." into ics-mr1
Dianne Hackborn [Wed, 30 Nov 2011 22:15:55 +0000 (14:15 -0800)]
am
88f10c6c: Merge "Fix issue #
5679504: Device stuck and sudden reboot - Watchdog reset?" into ics-mr1
* commit '
88f10c6ce5a97b1990934148deb8ed6aa6ef7a48':
Fix issue #
5679504: Device stuck and sudden reboot - Watchdog reset?
Dianne Hackborn [Wed, 30 Nov 2011 22:13:42 +0000 (14:13 -0800)]
am
f8d20bd6: Merge "Turn off debug log." into ics-mr1
* commit '
f8d20bd6495883e98e23827a2e5ed03766fe483b':
Turn off debug log.
Dianne Hackborn [Wed, 30 Nov 2011 22:12:44 +0000 (14:12 -0800)]
Merge "Fix issue #
5679504: Device stuck and sudden reboot - Watchdog reset?" into ics-mr1
Dianne Hackborn [Wed, 30 Nov 2011 22:11:17 +0000 (14:11 -0800)]
Merge "Turn off debug log." into ics-mr1
Romain Guy [Wed, 30 Nov 2011 22:09:21 +0000 (14:09 -0800)]
am
7797cae2: Merge "Cache drawable constant states instead of drawables Bug #
5678369" into ics-mr1
* commit '
7797cae2564eccf6d817b06d8116bd9cdc8e9ed4':
Cache drawable constant states instead of drawables Bug #
5678369
Romain Guy [Wed, 30 Nov 2011 22:07:34 +0000 (14:07 -0800)]
Merge "Cache drawable constant states instead of drawables Bug #
5678369" into ics-mr1
Mathias Agopian [Wed, 30 Nov 2011 21:54:46 +0000 (13:54 -0800)]
am
e8ba2aba: Merge "add a way to access the version string of the h/w implementation of EGL" into ics-mr1
* commit '
e8ba2aba934e3767d2081007bba93bad68566d22':
add a way to access the version string of the h/w implementation of EGL
Mathias Agopian [Wed, 30 Nov 2011 21:52:21 +0000 (13:52 -0800)]
Merge "add a way to access the version string of the h/w implementation of EGL" into ics-mr1
Daniel Sandler [Wed, 30 Nov 2011 19:55:50 +0000 (11:55 -0800)]
am
865b9802: Merge "Expanding NotificationManager\'s event logging." into ics-mr1
* commit '
865b98024fb5fa21854feb578b8816bbb72120ba':
Expanding NotificationManager's event logging.
Daniel Sandler [Wed, 30 Nov 2011 19:54:17 +0000 (11:54 -0800)]
Merge "Expanding NotificationManager's event logging." into ics-mr1
Jeff Sharkey [Wed, 30 Nov 2011 19:46:19 +0000 (11:46 -0800)]
am
47e4015b: Merge "Avoid airplane mode labels when Wi-Fi enabled." into ics-mr1
* commit '
47e4015ba23c507196980dcb4a311afc7e2358b1':
Avoid airplane mode labels when Wi-Fi enabled.
Jeff Sharkey [Wed, 30 Nov 2011 19:44:54 +0000 (11:44 -0800)]
Merge "Avoid airplane mode labels when Wi-Fi enabled." into ics-mr1
Svetoslav Ganov [Wed, 30 Nov 2011 18:27:45 +0000 (10:27 -0800)]
am
2f504d9e: Merge "NumberPicker incorrectly shown for the old theme." into ics-mr1
* commit '
2f504d9ea8aa18cd8dbaa2dcc3f3959252b414cc':
NumberPicker incorrectly shown for the old theme.
Svetoslav Ganov [Wed, 30 Nov 2011 18:25:42 +0000 (10:25 -0800)]
Merge "NumberPicker incorrectly shown for the old theme." into ics-mr1
Dianne Hackborn [Wed, 30 Nov 2011 18:22:37 +0000 (10:22 -0800)]
am
db904b47: Merge "Fix issue #
5628789: Cannot set static/custom wallpaper after clearing Settings data" into ics-mr1
* commit '
db904b4782a4dfc9d81d5d0616dea3656893b539':
Fix issue #
5628789: Cannot set static/custom wallpaper after clearing Settings data
Dianne Hackborn [Wed, 30 Nov 2011 18:20:29 +0000 (10:20 -0800)]
Merge "Fix issue #
5628789: Cannot set static/custom wallpaper after clearing Settings data" into ics-mr1
Narayan Kamath [Wed, 30 Nov 2011 12:57:10 +0000 (04:57 -0800)]
am
cc084f1d: Fix superfluous onError callbacks.
* commit '
cc084f1d734c1e332d6acc1f89204036ee82bd0c':
Fix superfluous onError callbacks.
Mathias Agopian [Wed, 30 Nov 2011 01:55:46 +0000 (17:55 -0800)]
add a way to access the version string of the h/w implementation of EGL
we use a hidden egl extension. the version string is printed
in SF's dumpsys log.
Change-Id: I123eb4bde6de462bb2404c67b74d6d6219a48d6a
Mathias Agopian [Wed, 30 Nov 2011 01:48:01 +0000 (17:48 -0800)]
am
bb1e7d43: Merge changes I7e973a35,Ib3386fcc into ics-mr1
* commit '
bb1e7d4324ff43491c526c77f405bbbf0cece611':
SurfaceTexture: add EGL_KHR_fence_sync option
SurfaceTexture: add a blit-to-FBO test
Mathias Agopian [Wed, 30 Nov 2011 01:46:35 +0000 (17:46 -0800)]
Merge changes I7e973a35,Ib3386fcc into ics-mr1
* changes:
SurfaceTexture: add EGL_KHR_fence_sync option
SurfaceTexture: add a blit-to-FBO test
Jamie Gennis [Wed, 30 Nov 2011 01:26:32 +0000 (17:26 -0800)]
am
6f1dd757: Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1
* commit '
6f1dd757cb158d17c76baeb170f7db2271802ef8':
SurfaceMediaSource: use the vid enc usage bit
Jamie Gennis [Wed, 30 Nov 2011 01:25:09 +0000 (17:25 -0800)]
Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1
Jamie Gennis [Mon, 14 Nov 2011 22:51:01 +0000 (14:51 -0800)]
SurfaceTexture: add EGL_KHR_fence_sync option
This change adds a compile-time option for SurfaceTexture to use the
EGL_KHR_fence_sync extension to synchronize access to Gralloc buffers.
Bug:
5122031
Change-Id: I7e973a358631fff5308acf377581b811911fe790
Chris Craik [Wed, 30 Nov 2011 00:57:29 +0000 (16:57 -0800)]
am
f296ee69: Merge "Send animation start notification back to webkit from ui thread" into ics-mr1
* commit '
f296ee697409b4b55bef17d534edbc24a4619f0f':
Send animation start notification back to webkit from ui thread
Chris Craik [Wed, 30 Nov 2011 00:55:47 +0000 (16:55 -0800)]
Merge "Send animation start notification back to webkit from ui thread" into ics-mr1
Dianne Hackborn [Tue, 29 Nov 2011 23:30:08 +0000 (15:30 -0800)]
am
1808f214: Merge "Fix issue #
5636525: ANR observed in setup wizard after changing language" into ics-mr1
* commit '
1808f214b0cd7a62628b273b93a1ea688f262565':
Fix issue #
5636525: ANR observed in setup wizard after changing language
Dianne Hackborn [Tue, 29 Nov 2011 23:28:41 +0000 (15:28 -0800)]
Merge "Fix issue #
5636525: ANR observed in setup wizard after changing language" into ics-mr1
Jamie Gennis [Sat, 12 Nov 2011 02:05:11 +0000 (18:05 -0800)]
SurfaceTexture: add a blit-to-FBO test
This change adds a test for blitting (via GL rendering) from a
SurfaceTexture to an FBO.
Change-Id: Ib3386fcc3f37153277f3e37a26347441bb80ab58
Teng-Hui Zhu [Tue, 29 Nov 2011 22:21:10 +0000 (14:21 -0800)]
am
d3788b97: Merge "WebView animation support" into ics-mr1
* commit '
d3788b97c9a28e8cbfa4432389a5de04073a333b':
WebView animation support
Teng-Hui Zhu [Tue, 29 Nov 2011 22:18:27 +0000 (14:18 -0800)]
Merge "WebView animation support" into ics-mr1
Romain Guy [Tue, 29 Nov 2011 22:16:59 +0000 (14:16 -0800)]
am
a9a91ad3: Merge "Improve screenshot animation performance Bug #
5525888" into ics-mr1
* commit '
a9a91ad356271c4c4d663223ff42694fbeb1d2a0':
Improve screenshot animation performance Bug #
5525888
Romain Guy [Tue, 29 Nov 2011 22:14:44 +0000 (14:14 -0800)]
Merge "Improve screenshot animation performance Bug #
5525888" into ics-mr1
Andreas Huber [Tue, 29 Nov 2011 22:12:21 +0000 (14:12 -0800)]
am
564fee36: Merge "Make sure we can properly shutdown even if" into ics-mr1
* commit '
564fee36667e2699c59a29102136220dc2f65862':
Make sure we can properly shutdown even if
Andreas Huber [Tue, 29 Nov 2011 22:12:20 +0000 (14:12 -0800)]
am
d12dc284: Merge "If an error occurs that prevents us from reallocating buffers during a format change" into ics-mr1
* commit '
d12dc28460f622ab29e83fa688ad83a8263e9417':
If an error occurs that prevents us from reallocating buffers during a format change
Andreas Huber [Tue, 29 Nov 2011 22:12:18 +0000 (14:12 -0800)]
am
351143fb: Merge "Updated (internal) API for IStreamSource to signal discontinuities" into ics-mr1
* commit '
351143fb0e2fcfb7dc2ef1045d693c71eb0ea329':
Updated (internal) API for IStreamSource to signal discontinuities
Andreas Huber [Tue, 29 Nov 2011 22:10:09 +0000 (14:10 -0800)]
am
405a4e34: Merge "Finer granularity discontinuity support." into ics-mr1
* commit '
405a4e34032f8a07028138266fe9f79f6753b466':
Finer granularity discontinuity support.
Andreas Huber [Tue, 29 Nov 2011 22:09:10 +0000 (14:09 -0800)]
Merge "Make sure we can properly shutdown even if" into ics-mr1
Andreas Huber [Tue, 29 Nov 2011 22:09:03 +0000 (14:09 -0800)]
Merge "If an error occurs that prevents us from reallocating buffers during a format change" into ics-mr1
Andreas Huber [Tue, 29 Nov 2011 22:08:45 +0000 (14:08 -0800)]
Merge "Updated (internal) API for IStreamSource to signal discontinuities" into ics-mr1
Andreas Huber [Tue, 29 Nov 2011 22:08:13 +0000 (14:08 -0800)]
Merge "Finer granularity discontinuity support." into ics-mr1
Jeff Brown [Tue, 29 Nov 2011 21:15:51 +0000 (13:15 -0800)]
am
be6ab576: Merge "Fix application launch shortcuts." into ics-mr1
* commit '
be6ab576ff0e3bf2a8dc3feee6f476061afbda30':
Fix application launch shortcuts.
Jeff Brown [Tue, 29 Nov 2011 21:13:33 +0000 (13:13 -0800)]
Merge "Fix application launch shortcuts." into ics-mr1
Dianne Hackborn [Tue, 29 Nov 2011 21:09:03 +0000 (13:09 -0800)]
am
50b20425: Merge "Another attempt at getting OOM reports to batch." into ics-mr1
* commit '
50b2042502bc459b40430fe3b3b83d7d61e5daf9':
Another attempt at getting OOM reports to batch.
Dianne Hackborn [Tue, 29 Nov 2011 21:05:26 +0000 (13:05 -0800)]
Merge "Another attempt at getting OOM reports to batch." into ics-mr1
Jeff Brown [Mon, 28 Nov 2011 20:59:11 +0000 (12:59 -0800)]
Fix application launch shortcuts.
Improved quick launch bookmarks to support category-based shortcuts
instead of hardcoding package and class names for all apps.
Added a set of Intent categories for typical applications on the
platform.
Added support for some of the HID application launch usages to
reduce reliance on quick launch for special purpose keys. Some
keyboard vendors have hardcoded launch keys that synthesize
"Search + X" type key combos. The goal is to encourage them
to stop doing this by implementing more of HID.
Bug:
5674723
Change-Id: I79f1147c65a208efc3f67228c9f0fa5cd050c593
Eric Fischer [Tue, 29 Nov 2011 19:47:08 +0000 (11:47 -0800)]
am
9ab3c624: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
9ab3c62499c054b600699fb107c28fc8926ca5a1':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 29 Nov 2011 19:44:59 +0000 (11:44 -0800)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Mathias Agopian [Tue, 29 Nov 2011 19:36:54 +0000 (11:36 -0800)]
am
3f2730c5: Merge "temporarily hardcode Nexus S refresh rate" into ics-mr1
* commit '
3f2730c5317700e3ae5412b5c825a747b591ebc2':
temporarily hardcode Nexus S refresh rate
Mathias Agopian [Tue, 29 Nov 2011 19:35:07 +0000 (11:35 -0800)]
Merge "temporarily hardcode Nexus S refresh rate" into ics-mr1
Dianne Hackborn [Tue, 29 Nov 2011 18:17:42 +0000 (10:17 -0800)]
am
9b518d93: Merge "Fix issue #
5642121: Proximity sensor didn\'t turn the screen on in call" into ics-mr1
* commit '
9b518d9304eb4ad17591944926231b661a3dfce0':
Fix issue #
5642121: Proximity sensor didn't turn the screen on in call
Dianne Hackborn [Tue, 29 Nov 2011 18:16:11 +0000 (10:16 -0800)]
Merge "Fix issue #
5642121: Proximity sensor didn't turn the screen on in call" into ics-mr1
Jaikumar Ganesh [Tue, 29 Nov 2011 18:07:09 +0000 (10:07 -0800)]
am
eb701df8: Merge "Cleanup references when turning BT off." into ics-mr1
* commit '
eb701df88cb3027d6323f9e2607cbe4d5ca93ac2':
Cleanup references when turning BT off.
Jaikumar Ganesh [Tue, 29 Nov 2011 18:07:07 +0000 (10:07 -0800)]
am
ff33b94e: Merge "Cleanup static references when quitting." into ics-mr1
* commit '
ff33b94e236fcde3833fba698d32d0e6b98fa303':
Cleanup static references when quitting.
Jaikumar Ganesh [Tue, 29 Nov 2011 18:05:27 +0000 (10:05 -0800)]
Merge "Cleanup references when turning BT off." into ics-mr1
Jaikumar Ganesh [Tue, 29 Nov 2011 18:05:13 +0000 (10:05 -0800)]
Merge "Cleanup static references when quitting." into ics-mr1
Gilles Debunne [Tue, 29 Nov 2011 18:01:35 +0000 (10:01 -0800)]
am
10232fe6: Merge "Extracted text problems" into ics-mr1
* commit '
10232fe63916d03d147d0a07f8bf4d70cb60941c':
Extracted text problems
Gilles Debunne [Tue, 29 Nov 2011 17:59:25 +0000 (09:59 -0800)]
am
7be31bd9: Merge "IOOB in text selection." into ics-mr1
* commit '
7be31bd96a4cc71ebc2539573f062fa53cc7cb05':
IOOB in text selection.