OSDN Git Service
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.
Gilles Debunne [Tue, 29 Nov 2011 17:59:00 +0000 (09:59 -0800)]
Merge "Extracted text problems" into ics-mr1
Gilles Debunne [Tue, 29 Nov 2011 17:56:58 +0000 (09:56 -0800)]
Merge "IOOB in text selection." into ics-mr1
Daniel Sandler [Tue, 29 Nov 2011 13:51:18 +0000 (05:51 -0800)]
am
fed7a99a: Merge "Quick fix for bug
5646217 blocking automation tests" into ics-mr1
* commit '
fed7a99a5294856d930e18225898828bd6755be1':
Quick fix for bug
5646217 blocking automation tests
Daniel Sandler [Tue, 29 Nov 2011 13:49:11 +0000 (05:49 -0800)]
Merge "Quick fix for bug
5646217 blocking automation tests" into ics-mr1
Yu Shan Emily Lau [Tue, 29 Nov 2011 03:55:27 +0000 (19:55 -0800)]
am
4e5d3f2c: Merge "Add the min fps option to set the min fps in the media recorder test. Add the procmem log to the media memory stress test." into ics-mr1
* commit '
4e5d3f2ca05b513640d3163155756e01ae577d54':
Add the min fps option to set the min fps in the media recorder test. Add the procmem log to the media memory stress test.
Yu Shan Emily Lau [Tue, 29 Nov 2011 03:53:58 +0000 (19:53 -0800)]
Merge "Add the min fps option to set the min fps in the media recorder test. Add the procmem log to the media memory stress test." into ics-mr1
Christopher Tate [Tue, 29 Nov 2011 01:58:25 +0000 (17:58 -0800)]
am
05160615: Merge "Add iteration-limited mode to FrameworkPerf" into ics-mr1
* commit '
051606150a80efa71b139e9d52fe6c8b2c02c884':
Add iteration-limited mode to FrameworkPerf
Christopher Tate [Tue, 29 Nov 2011 01:56:18 +0000 (17:56 -0800)]
Merge "Add iteration-limited mode to FrameworkPerf" into ics-mr1
Xia Wang [Tue, 29 Nov 2011 00:57:14 +0000 (16:57 -0800)]
Dianne Hackborn [Tue, 29 Nov 2011 00:55:05 +0000 (16:55 -0800)]
am
b54980d1: Merge "Fix issue #
5588689: Black camera preview after coming back from gmail" into ics-mr1
* commit '
b54980d1d4d903f68cdfa952256afff01902cd94':
Fix issue #
5588689: Black camera preview after coming back from gmail
Xia Wang [Tue, 29 Nov 2011 00:53:50 +0000 (16:53 -0800)]
Dianne Hackborn [Tue, 29 Nov 2011 00:53:00 +0000 (16:53 -0800)]
Merge "Fix issue #
5588689: Black camera preview after coming back from gmail" into ics-mr1
Romain Guy [Tue, 29 Nov 2011 00:08:52 +0000 (16:08 -0800)]
am
46685db9: Merge "Fix crash in existing applications Bug #
5659476" into ics-mr1
* commit '
46685db957cc01cef4ba198aafe44d99fe31f62c':
Fix crash in existing applications Bug #
5659476
Romain Guy [Tue, 29 Nov 2011 00:06:52 +0000 (16:06 -0800)]
Merge "Fix crash in existing applications Bug #
5659476" into ics-mr1
Xia Wang [Tue, 29 Nov 2011 00:04:39 +0000 (16:04 -0800)]
am
da822367: am
25261f59: Merge "Increase time between wifi stop and wifi start: set to 2 minutes b/issue?id=
5629901" into ics-mr0
* commit '
da822367886d68f997153c7edd5368f3dfb6d58d':
Increase time between wifi stop and wifi start: set to 2 minutes http://b/issue?id=
5629901
Xia Wang [Tue, 29 Nov 2011 00:02:44 +0000 (16:02 -0800)]
am
25261f59: Merge "Increase time between wifi stop and wifi start: set to 2 minutes b/issue?id=
5629901" into ics-mr0
* commit '
25261f59af0d902f239e541b735f7dc31e714b07':
Increase time between wifi stop and wifi start: set to 2 minutes http://b/issue?id=
5629901
Xia Wang [Tue, 29 Nov 2011 00:00:49 +0000 (16:00 -0800)]
Merge "Increase time between wifi stop and wifi start: set to 2 minutes b/issue?id=
5629901" into ics-mr0
Chet Haase [Mon, 28 Nov 2011 23:45:32 +0000 (15:45 -0800)]
am
8990cb57: Merge "Fix flashing wifi dialog after rotating back from landscape." into ics-mr1
* commit '
8990cb5768efba46bb1d7458377dd44498afcfdb':
Fix flashing wifi dialog after rotating back from landscape.
Chet Haase [Mon, 28 Nov 2011 23:43:23 +0000 (15:43 -0800)]
Merge "Fix flashing wifi dialog after rotating back from landscape." into ics-mr1
Eric Rowe [Mon, 28 Nov 2011 22:26:39 +0000 (14:26 -0800)]
am
500afb87: Merge "Fix SCO start stop tests." into ics-mr1
* commit '
500afb87a7a8b5928ef1a5196bdfd0bcc2b87e4a':
Fix SCO start stop tests.
Eric Rowe [Mon, 28 Nov 2011 20:32:34 +0000 (12:32 -0800)]
Merge "Fix SCO start stop tests." into ics-mr1
Narayan Kamath [Mon, 28 Nov 2011 18:39:07 +0000 (10:39 -0800)]
am
a6f8ebc6: Merge "Fix TTS instantiation from webview accessibility handlers." into ics-mr1
* commit '
a6f8ebc616cfe3185ae2513ef2f846e8d32b551e':
Fix TTS instantiation from webview accessibility handlers.
Narayan Kamath [Mon, 28 Nov 2011 18:36:32 +0000 (10:36 -0800)]
Merge "Fix TTS instantiation from webview accessibility handlers." into ics-mr1
Derek Sollenberger [Mon, 28 Nov 2011 18:35:57 +0000 (10:35 -0800)]
am
425c595a: Merge "Update Webkit with the zoom level after double tap gesture" into ics-mr1
* commit '
425c595acb798ed9652b5a1f0e5412cbd8e3873d':
Update Webkit with the zoom level after double tap gesture
Derek Sollenberger [Mon, 28 Nov 2011 18:34:04 +0000 (10:34 -0800)]
Merge "Update Webkit with the zoom level after double tap gesture" into ics-mr1
Ben Murdoch [Mon, 28 Nov 2011 18:33:48 +0000 (10:33 -0800)]
am
2ffc9ec3: Ensure we dismiss the <select> option dialog.
* commit '
2ffc9ec3d69d8ee95bce1ccf17163a70b0bd9003':
Ensure we dismiss the <select> option dialog.
Narayan Kamath [Thu, 24 Nov 2011 17:40:04 +0000 (09:40 -0800)]
am
e35581ad: Merge "Fix regressions in TTS completion callbacks." into ics-mr1
* commit '
e35581ad5ad635f9dcfe4ab6a432c48b46b782cd':
Fix regressions in TTS completion callbacks.
Narayan Kamath [Thu, 24 Nov 2011 17:38:15 +0000 (09:38 -0800)]
Merge "Fix regressions in TTS completion callbacks." into ics-mr1
Irfan Sheriff [Thu, 24 Nov 2011 03:19:56 +0000 (19:19 -0800)]
am
7b6d238b: Merge "Fix tethering interaction from wifi" into ics-mr1
* commit '
7b6d238b7515fdd070c361a03e99e6022f2cd2ba':
Fix tethering interaction from wifi
Irfan Sheriff [Thu, 24 Nov 2011 03:18:22 +0000 (19:18 -0800)]
Merge "Fix tethering interaction from wifi" into ics-mr1
John Wang [Thu, 24 Nov 2011 00:50:04 +0000 (16:50 -0800)]
am
e95f4986: Merge "Fix a build break." into ics-mr1
* commit '
e95f49869b02dd9792718fb1075241acdf6ca775':
Fix a build break.
John Wang [Thu, 24 Nov 2011 00:48:32 +0000 (16:48 -0800)]
Merge "Fix a build break." into ics-mr1
Adam Cohen [Thu, 24 Nov 2011 00:41:01 +0000 (16:41 -0800)]
am
8ce22f26: Fixing a typo in framework widget padding
* commit '
8ce22f2644acb51bfe0b9d600f1d2ad64e80513c':
Fixing a typo in framework widget padding
John Wang [Wed, 23 Nov 2011 23:37:20 +0000 (15:37 -0800)]
am
9b108009: Check watingApns before access it.
* commit '
9b1080091c4ac97378db366cdd6961aba28756c5':
Check watingApns before access it.
Mathias Agopian [Wed, 23 Nov 2011 22:51:09 +0000 (14:51 -0800)]
temporarily hardcode Nexus S refresh rate
Change-Id: Id8465f679b96636041b4b891d0b358c387d456c3
Eric Laurent [Wed, 23 Nov 2011 20:32:53 +0000 (12:32 -0800)]
am
20398fac: Merge "audioflinger: reduce sleep time to avoid underrun" into ics-mr1
* commit '
20398fac99ff78cb3ec3dd122930e45d409e0524':
audioflinger: reduce sleep time to avoid underrun
Eric Laurent [Wed, 23 Nov 2011 20:31:04 +0000 (12:31 -0800)]
Merge "audioflinger: reduce sleep time to avoid underrun" into ics-mr1
Michael Chan [Wed, 23 Nov 2011 20:14:16 +0000 (12:14 -0800)]
am
37ac88f9: Merge "Update description of account_type" into ics-mr1
* commit '
37ac88f994c5b8af291acd9c8d7eb5e22ce3c489':
Update description of account_type
Michael Chan [Wed, 23 Nov 2011 20:12:51 +0000 (12:12 -0800)]
Merge "Update description of account_type" into ics-mr1
Robert Greenwalt [Wed, 23 Nov 2011 19:27:06 +0000 (11:27 -0800)]
am
eaeb4f4e: Merge "Fix some policy-base routing issues." into ics-mr1
* commit '
eaeb4f4e3c914550d28a042fb3d752efcf20ab9e':
Fix some policy-base routing issues.
Robert Greenwalt [Wed, 23 Nov 2011 19:25:39 +0000 (11:25 -0800)]
Merge "Fix some policy-base routing issues." into ics-mr1
Owen Lin [Wed, 23 Nov 2011 01:46:35 +0000 (17:46 -0800)]
am
8bb56180: Merge "Fix
5654631. It forgot to consider the year in formatDateRange." into ics-mr1
* commit '
8bb56180d208b9264e5a56b49fe06b8471ccaced':
Fix
5654631. It forgot to consider the year in formatDateRange.
Owen Lin [Wed, 23 Nov 2011 01:44:52 +0000 (17:44 -0800)]
Merge "Fix
5654631. It forgot to consider the year in formatDateRange." into ics-mr1
The Android Open Source Project [Tue, 22 Nov 2011 23:26:16 +0000 (15:26 -0800)]
am
1889bb49: Reconcile with ics-mr0-release
* commit '
1889bb49a411cf79dd6ccd162bcddb13bd2567bb':
The Android Open Source Project [Tue, 22 Nov 2011 23:24:03 +0000 (15:24 -0800)]
Reconcile with ics-mr0-release
Change-Id: Ib84a053208dd4deae9bfe04e185ab2cec4728864
The Android Open Source Project [Tue, 22 Nov 2011 23:16:08 +0000 (15:16 -0800)]
am
27239099: Reconcile with ics-mr0-release
* commit '
2723909903b68db016666a13ec897581a8915636':
The Android Open Source Project [Tue, 22 Nov 2011 23:14:10 +0000 (15:14 -0800)]
Reconcile with ics-mr0-release
Change-Id: I0b5b295a6fc0e4e7978ce11905c3cffd0e07f7e1
The Android Automerger [Tue, 22 Nov 2011 22:28:06 +0000 (14:28 -0800)]
merge in ics-mr0-release history after reset to ics-mr0
dujin.cha [Tue, 22 Nov 2011 21:20:09 +0000 (13:20 -0800)]
am
eabde3d4: am
fe464a76: [Prime K] Fix gabage character issue
* commit '
eabde3d4a9027a19443a31c7c7cda3d44fb0ffe0':
[Prime K] Fix gabage character issue
OSDN Git Service
