OSDN Git Service
Romain Guy [Wed, 15 Feb 2012 00:55:55 +0000 (16:55 -0800)]
Merge "Clarify documentation of Bitmap.createScaledBitmap/createBitmap Bug #
6015472"
Siva Velusamy [Wed, 15 Feb 2012 00:36:44 +0000 (16:36 -0800)]
Merge "gltrace: Patch up all glUniform*() calls."
Jamie Gennis [Wed, 15 Feb 2012 00:29:02 +0000 (16:29 -0800)]
Merge "Refactored query function from SurfaceTexture into BufferQueue"
Amith Yamasani [Wed, 15 Feb 2012 00:12:27 +0000 (16:12 -0800)]
Merge "Mixed up uid and user-id."
Chris Craik [Tue, 14 Feb 2012 23:56:08 +0000 (15:56 -0800)]
Merge "disable webkit paint pausing"
Eric Fischer [Tue, 14 Feb 2012 23:52:50 +0000 (15:52 -0800)]
Merge "Import translations."
Amith Yamasani [Tue, 14 Feb 2012 23:52:17 +0000 (15:52 -0800)]
Merge "Revert "Incorrect behavior of View clear focus.""
Gilles Debunne [Tue, 14 Feb 2012 23:48:04 +0000 (15:48 -0800)]
Merge "Display list invalidated on hint text change"
Irfan Sheriff [Tue, 14 Feb 2012 23:37:07 +0000 (15:37 -0800)]
Merge "Initial support for concurrency"
Omari Stephens [Tue, 14 Feb 2012 23:18:58 +0000 (15:18 -0800)]
Merge "Add a method to the smoke test that launches each app"
Siva Velusamy [Tue, 14 Feb 2012 23:08:20 +0000 (15:08 -0800)]
gltrace: Patch up all glUniform*() calls.
This patch updates the trace information for all glUniform*() calls
to have the right data (the actual uniforms that are passed).
In addition, as soon as a program is linked, information regarding
all the active attributes and uniforms is passed on to the debugger.
Change-Id: Icfbc6722789b42c413a845cf546577fa6de7da2b
Michael Jurka [Tue, 14 Feb 2012 22:56:21 +0000 (14:56 -0800)]
Merge "Fix the build"
Fabrice Di Meglio [Tue, 14 Feb 2012 22:45:51 +0000 (14:45 -0800)]
Merge "Make textDirection API public"
Gilles Debunne [Tue, 14 Feb 2012 22:41:15 +0000 (14:41 -0800)]
Merge "Minor typo fixes"
Michael Jurka [Tue, 14 Feb 2012 21:57:14 +0000 (13:57 -0800)]
Merge "Making recents faster"
Stephen Hines [Tue, 14 Feb 2012 21:38:43 +0000 (13:38 -0800)]
Merge "Fix typos/spacing with new APIs."
Stephen Hines [Tue, 14 Feb 2012 21:35:21 +0000 (13:35 -0800)]
Merge "Initialize all class members."
Joe Fernandez [Tue, 14 Feb 2012 21:30:50 +0000 (13:30 -0800)]
am
c9f1eb20: am
6a9beb53: am
835e07f8: Merge "docs: Android NDK r7b Release Notes" into ics-mr1
* commit '
c9f1eb20033d50dadbe028985bedc5022c50ce4c':
Mike Lockwood [Tue, 14 Feb 2012 21:30:47 +0000 (13:30 -0800)]
am
ac7ab269: am
5f423d88: am
ffc89899: Merge "Don\'t pulse LED on new notification unless notification has LED flag set" into ics-mr1
* commit '
ac7ab269e5a8c3d25ac243efcc92cc791002e6b9':
John Wang [Tue, 14 Feb 2012 21:30:46 +0000 (13:30 -0800)]
am
71bece56: am
749b32df: am
63b59666: Merge "Only use CDMA rssi for config_alwaysUseCdmaRssi." into ics-mr1
* commit '
71bece56377896f4799a6d480c459c4344050e64':
Joe Fernandez [Tue, 14 Feb 2012 21:08:04 +0000 (13:08 -0800)]
am
08851a53: am
57f55d7f: am
835e07f8: Merge "docs: Android NDK r7b Release Notes" into ics-mr1
* commit '
08851a53a147a4022a37fb61ba17fd2876d2afc5':
docs: Android NDK r7b Release Notes
Mike Lockwood [Tue, 14 Feb 2012 21:08:01 +0000 (13:08 -0800)]
am
8f7cc7af: am
b9be8eff: am
ffc89899: Merge "Don\'t pulse LED on new notification unless notification has LED flag set" into ics-mr1
* commit '
8f7cc7af66520e3bd5e59e8eadb6907e3e043661':
Don't pulse LED on new notification unless notification has LED flag set
John Wang [Tue, 14 Feb 2012 21:07:58 +0000 (13:07 -0800)]
am
0b17fc36: am
252c64f9: am
63b59666: Merge "Only use CDMA rssi for config_alwaysUseCdmaRssi." into ics-mr1
* commit '
0b17fc360185ca7b9d05a096b0033ddd8d883940':
Only use CDMA rssi for config_alwaysUseCdmaRssi.
Joe Fernandez [Tue, 14 Feb 2012 21:06:16 +0000 (13:06 -0800)]
am
6a9beb53: am
835e07f8: Merge "docs: Android NDK r7b Release Notes" into ics-mr1
* commit '
6a9beb536f13c4df178cbe67c74c30d258bef28f':
Mike Lockwood [Tue, 14 Feb 2012 21:06:14 +0000 (13:06 -0800)]
am
5f423d88: am
ffc89899: Merge "Don\'t pulse LED on new notification unless notification has LED flag set" into ics-mr1
* commit '
5f423d88753e7c123527d4b7b940788eb2c94821':
John Wang [Tue, 14 Feb 2012 21:06:11 +0000 (13:06 -0800)]
am
749b32df: am
63b59666: Merge "Only use CDMA rssi for config_alwaysUseCdmaRssi." into ics-mr1
* commit '
749b32dfe6ece3ce6ced71d05351a1139d4a4cd4':
Teng-Hui Zhu [Tue, 14 Feb 2012 20:51:19 +0000 (12:51 -0800)]
Merge "Update the scale while updating the drawGL functor"
Joe Fernandez [Tue, 14 Feb 2012 20:42:44 +0000 (12:42 -0800)]
am
57f55d7f: am
835e07f8: Merge "docs: Android NDK r7b Release Notes" into ics-mr1
* commit '
57f55d7f9cc1d194054020fcb4e6226579818e27':
docs: Android NDK r7b Release Notes
Mike Lockwood [Tue, 14 Feb 2012 20:42:42 +0000 (12:42 -0800)]
am
b9be8eff: am
ffc89899: Merge "Don\'t pulse LED on new notification unless notification has LED flag set" into ics-mr1
* commit '
b9be8eff222d9b70079dd53d0d61de229d8d7914':
Don't pulse LED on new notification unless notification has LED flag set
John Wang [Tue, 14 Feb 2012 20:42:40 +0000 (12:42 -0800)]
am
252c64f9: am
63b59666: Merge "Only use CDMA rssi for config_alwaysUseCdmaRssi." into ics-mr1
* commit '
252c64f9c3e2e357f8687e18d8a066cc1cdb8c15':
Only use CDMA rssi for config_alwaysUseCdmaRssi.
Joe Fernandez [Tue, 14 Feb 2012 20:37:43 +0000 (12:37 -0800)]
am
835e07f8: Merge "docs: Android NDK r7b Release Notes" into ics-mr1
* commit '
835e07f8f437e1872451dd23c0faf925388e1aef':
docs: Android NDK r7b Release Notes
Mike Lockwood [Tue, 14 Feb 2012 20:37:40 +0000 (12:37 -0800)]
am
ffc89899: Merge "Don\'t pulse LED on new notification unless notification has LED flag set" into ics-mr1
* commit '
ffc89899652f5c815b6d156f55a909001420891e':
Don't pulse LED on new notification unless notification has LED flag set
John Wang [Tue, 14 Feb 2012 20:37:38 +0000 (12:37 -0800)]
am
63b59666: Merge "Only use CDMA rssi for config_alwaysUseCdmaRssi." into ics-mr1
* commit '
63b596664c3fdb70ad32c8f641f477ec9140d6ec':
Only use CDMA rssi for config_alwaysUseCdmaRssi.
Joe Fernandez [Tue, 14 Feb 2012 20:37:18 +0000 (12:37 -0800)]
am
835e07f8: Merge "docs: Android NDK r7b Release Notes" into ics-mr1
* commit '
835e07f8f437e1872451dd23c0faf925388e1aef':
docs: Android NDK r7b Release Notes
Mike Lockwood [Tue, 14 Feb 2012 20:37:16 +0000 (12:37 -0800)]
am
ffc89899: Merge "Don\'t pulse LED on new notification unless notification has LED flag set" into ics-mr1
* commit '
ffc89899652f5c815b6d156f55a909001420891e':
Don't pulse LED on new notification unless notification has LED flag set
John Wang [Tue, 14 Feb 2012 20:37:14 +0000 (12:37 -0800)]
am
63b59666: Merge "Only use CDMA rssi for config_alwaysUseCdmaRssi." into ics-mr1
* commit '
63b596664c3fdb70ad32c8f641f477ec9140d6ec':
Only use CDMA rssi for config_alwaysUseCdmaRssi.
Mathias Agopian [Tue, 14 Feb 2012 20:35:02 +0000 (12:35 -0800)]
Merge changes I7a6b9db4,Ib579f580
* changes:
EGLConfig is now not remaped to an internal EGLConfig
remove multiplexing of multiple EGL implementation
Joe Fernandez [Tue, 14 Feb 2012 20:05:25 +0000 (12:05 -0800)]
Merge "docs: Android NDK r7b Release Notes" into ics-mr1
Mike Lockwood [Tue, 14 Feb 2012 19:30:05 +0000 (11:30 -0800)]
Merge "Don't pulse LED on new notification unless notification has LED flag set" into ics-mr1
John Wang [Tue, 14 Feb 2012 18:09:26 +0000 (10:09 -0800)]
Merge "Only use CDMA rssi for config_alwaysUseCdmaRssi." into ics-mr1
Jean-Baptiste Queru [Tue, 14 Feb 2012 18:06:43 +0000 (10:06 -0800)]
Merge from master
Change-Id: I72b13c6443acdfb1b9ad477942f32a925fde5c61
Jean-Baptiste Queru [Tue, 14 Feb 2012 18:04:08 +0000 (10:04 -0800)]
Merge from master
Change-Id: I62479982edbb2229f84d20a581cccb703bdfc87b
Guang Zhu [Tue, 14 Feb 2012 18:02:44 +0000 (10:02 -0800)]
Merge "disable cpu_upload path workaround"
Jean-Baptiste Queru [Tue, 14 Feb 2012 17:57:28 +0000 (09:57 -0800)]
Merge from master
Change-Id: Ib9bc82ee0517945c5a713692d748042601d406ef
Ying Wang [Tue, 14 Feb 2012 17:53:36 +0000 (09:53 -0800)]
Merge "Build all font files as prebuilts."
Glenn Kasten [Tue, 14 Feb 2012 17:44:47 +0000 (09:44 -0800)]
Merge "Fix races related to volume and mute"
Glenn Kasten [Tue, 14 Feb 2012 17:43:45 +0000 (09:43 -0800)]
am
4f7adcf7: Merge "Update comments"
* commit '
4f7adcf76a6f97076c05720d9c20a221a57692cb':
Update comments
Glenn Kasten [Tue, 14 Feb 2012 17:42:32 +0000 (09:42 -0800)]
Merge "Update comments"
Chet Haase [Tue, 14 Feb 2012 17:22:10 +0000 (09:22 -0800)]
am
c87b0084: Merge "Refactor animation code in new Draw() method into its own method."
* commit '
c87b0084e3dbf5c0862d29f039ee908bccf39e9d':
Refactor animation code in new Draw() method into its own method.
Chet Haase [Tue, 14 Feb 2012 17:19:59 +0000 (09:19 -0800)]
Merge "Refactor animation code in new Draw() method into its own method."
Glenn Kasten [Thu, 19 Jan 2012 16:59:58 +0000 (08:59 -0800)]
Update comments
We no longer put the filename at start of file.
Change-Id: Ic435b159a23105681e3d4a6cb1ac097bc853302e
Glenn Kasten [Tue, 14 Feb 2012 17:10:39 +0000 (09:10 -0800)]
am
f4e1bdc1: Merge "Remove dead code AudioTrack::getLoop"
* commit '
f4e1bdc13e0c9bb6352e458bef283dfc7165e23f':
Remove dead code AudioTrack::getLoop
Glenn Kasten [Tue, 14 Feb 2012 17:10:36 +0000 (09:10 -0800)]
am
150d238f: Use size_t and ssize_t with Vector
* commit '
150d238f3a5218846c5f16e64958079d22ac11c4':
Use size_t and ssize_t with Vector
Glenn Kasten [Tue, 14 Feb 2012 17:09:03 +0000 (09:09 -0800)]
Merge "Remove dead code AudioTrack::getLoop"
Glenn Kasten [Tue, 14 Feb 2012 17:03:03 +0000 (09:03 -0800)]
am
d23d2b16: Merge "AudioRecord and AudioTrack client tid"
* commit '
d23d2b1662dc61222541310f7297cbee4e8b2b9d':
AudioRecord and AudioTrack client tid
Glenn Kasten [Tue, 14 Feb 2012 17:01:04 +0000 (09:01 -0800)]
Merge "AudioRecord and AudioTrack client tid"
Ramanan Rajeswaran [Tue, 14 Feb 2012 15:39:29 +0000 (07:39 -0800)]
am
c26b3a7f: am
128dfa51: (-s ours) Merge "DO NOT MERGE" into ics-scoop-plus-aosp
* commit '
c26b3a7f12da9f5d495378749a098811a29daf85':
DO NOT MERGE
Ramanan Rajeswaran [Tue, 14 Feb 2012 15:36:53 +0000 (07:36 -0800)]
am
128dfa51: (-s ours) Merge "DO NOT MERGE" into ics-scoop-plus-aosp
* commit '
128dfa514818399ff8b5fde56fa487374f6fd504':
DO NOT MERGE
Ramanan Rajeswaran [Tue, 14 Feb 2012 15:35:13 +0000 (07:35 -0800)]
Merge "DO NOT MERGE" into ics-scoop-plus-aosp
Chet Haase [Tue, 14 Feb 2012 14:22:06 +0000 (06:22 -0800)]
am
4212d3fc: Merge "Refactor ViewGroup.drawChild() into View.draw()"
* commit '
4212d3fc736712d6e5fb69d5067ce8d9a83806ef':
Refactor ViewGroup.drawChild() into View.draw()
Chet Haase [Tue, 14 Feb 2012 14:20:16 +0000 (06:20 -0800)]
Merge "Refactor ViewGroup.drawChild() into View.draw()"
Jeff Brown [Tue, 14 Feb 2012 04:39:58 +0000 (20:39 -0800)]
am
a9daa164: Merge "Fix possible races in vsync infrastructure."
* commit '
a9daa164a58fc70d08702787e69a56212f5ad8c9':
Fix possible races in vsync infrastructure.
Jeff Brown [Tue, 14 Feb 2012 04:38:24 +0000 (20:38 -0800)]
Merge "Fix possible races in vsync infrastructure."
Mathias Agopian [Tue, 14 Feb 2012 04:06:08 +0000 (20:06 -0800)]
EGLConfig is now not remaped to an internal EGLConfig
this is possible now that we support only a single
EGL implementation. this allows a large code simplification.
Change-Id: I7a6b9db4c5d60f4407c6061e7a68729af63d5242
Jean-Baptiste Queru [Tue, 14 Feb 2012 04:06:19 +0000 (20:06 -0800)]
am
b35b9a86: am
6466f400: am
fca4ff38: am
eaf2617f: am
472512f6: Merge "Fix incorrect prototype for JNI call"
* commit '
b35b9a8642365921a185eab5e8d4716f247fed85':
Fix incorrect prototype for JNI call
Jean-Baptiste Queru [Tue, 14 Feb 2012 04:02:50 +0000 (20:02 -0800)]
am
6466f400: am
fca4ff38: am
eaf2617f: am
472512f6: Merge "Fix incorrect prototype for JNI call"
* commit '
6466f400a40224dc113eb6d06009a1c655151045':
Fix incorrect prototype for JNI call
Jean-Baptiste Queru [Tue, 14 Feb 2012 04:00:40 +0000 (20:00 -0800)]
am
fca4ff38: am
eaf2617f: am
472512f6: Merge "Fix incorrect prototype for JNI call"
* commit '
fca4ff3851508d9d2c414aa535a86d7ac0eb5e72':
Fix incorrect prototype for JNI call
Jean-Baptiste Queru [Tue, 14 Feb 2012 03:58:09 +0000 (19:58 -0800)]
am
eaf2617f: am
472512f6: Merge "Fix incorrect prototype for JNI call"
* commit '
eaf2617fc20dd6484722edc9df41faf6e91d73cc':
Fix incorrect prototype for JNI call
Jean-Baptiste Queru [Tue, 14 Feb 2012 03:55:52 +0000 (19:55 -0800)]
am
472512f6: Merge "Fix incorrect prototype for JNI call"
* commit '
472512f6970fa170e2e1a3e1c24ac2b742e2e6b6':
Fix incorrect prototype for JNI call
Guang Zhu [Tue, 14 Feb 2012 02:40:55 +0000 (18:40 -0800)]
Guang Zhu [Tue, 14 Feb 2012 02:38:54 +0000 (18:38 -0800)]
Merge "fix build"
Guang Zhu [Tue, 14 Feb 2012 02:17:36 +0000 (18:17 -0800)]
am
4535e0c7: Merge "use hard coded WebViewProperties.gfxUseMinimalMemory"
* commit '
4535e0c765654574c6244b97385ee25f0584bcae':
use hard coded WebViewProperties.gfxUseMinimalMemory
Guang Zhu [Tue, 14 Feb 2012 02:15:57 +0000 (18:15 -0800)]
Merge "use hard coded WebViewProperties.gfxUseMinimalMemory"
Mathias Agopian [Tue, 14 Feb 2012 01:09:30 +0000 (17:09 -0800)]
remove multiplexing of multiple EGL implementation
from now on, the system can only have one EGL
implementation. this means the software and h/w renderer
cannot be used at the same time on a device. Of course, the
h/w renderer is always prefered; in its absence we
default to the software renderer.
Change-Id: Ib579f58055dd0ce4c4a99144131efa11c16ca3d3
Stephen Hines [Tue, 14 Feb 2012 02:08:08 +0000 (18:08 -0800)]
am
96d2abab: Merge "Revert "Revert "Test initialization of constant array exports."""
* commit '
96d2ababf5c9a8ccd42d67587a62637a18dc1beb':
Revert "Revert "Test initialization of constant array exports.""
Stephen Hines [Tue, 14 Feb 2012 02:06:22 +0000 (18:06 -0800)]
Merge "Revert "Revert "Test initialization of constant array exports."""
Romain Guy [Tue, 14 Feb 2012 02:05:46 +0000 (18:05 -0800)]
am
ccdc6a6a: Merge "New debugging tool in adb shell dumpsys gfxinfo"
* commit '
ccdc6a6accdc898ade946b6aada6f15f45192b98':
New debugging tool in adb shell dumpsys gfxinfo
Romain Guy [Tue, 14 Feb 2012 02:03:44 +0000 (18:03 -0800)]
Merge "New debugging tool in adb shell dumpsys gfxinfo"
Guang Zhu [Tue, 14 Feb 2012 01:40:52 +0000 (17:40 -0800)]
am
06a240e8: Merge "Increase transfer queue size for DRT"
* commit '
06a240e826107b32f1ebe305b0add1b72ef801ee':
Increase transfer queue size for DRT
Guang Zhu [Tue, 14 Feb 2012 01:39:08 +0000 (17:39 -0800)]
Merge "Increase transfer queue size for DRT"
Philip Milne [Tue, 14 Feb 2012 01:07:23 +0000 (17:07 -0800)]
am
94355ed4: Merge "New hooks to allow layouts to improve their performance by doing more caching"
* commit '
94355ed44a88d619f94948285a8dbe51ed7a7cb0':
New hooks to allow layouts to improve their performance by doing more caching
Philip Milne [Tue, 14 Feb 2012 01:05:01 +0000 (17:05 -0800)]
Merge "New hooks to allow layouts to improve their performance by doing more caching"
Irfan Sheriff [Tue, 14 Feb 2012 01:02:00 +0000 (17:02 -0800)]
am
5e264cc1: Merge "Fix shutdown delay"
* commit '
5e264cc1c0fff5fa7a474605e446f7354b8450b0':
Fix shutdown delay
Irfan Sheriff [Tue, 14 Feb 2012 00:59:34 +0000 (16:59 -0800)]
Merge "Fix shutdown delay"
Mangesh Ghiware [Tue, 14 Feb 2012 00:50:25 +0000 (16:50 -0800)]
am
7850783b: Merge "Fix regression in default zoom setting"
* commit '
7850783b73cda1d71e9a90a7256fe0348707f9dc':
Fix regression in default zoom setting
Glenn Kasten [Tue, 14 Feb 2012 00:47:49 +0000 (16:47 -0800)]
am
2e20ce35: Merge "Fix build warnings"
* commit '
2e20ce35e8c6b9c5fb4d1d198ef5d801ded21064':
Fix build warnings
Mangesh Ghiware [Tue, 14 Feb 2012 00:47:10 +0000 (16:47 -0800)]
Merge "Fix regression in default zoom setting"
Glenn Kasten [Tue, 14 Feb 2012 00:43:43 +0000 (16:43 -0800)]
Merge "Fix build warnings"
Marco Nelissen [Mon, 13 Feb 2012 23:50:25 +0000 (15:50 -0800)]
am
2e0f6715: Merge "Further optimize media scanner."
* commit '
2e0f67159afa03133772d89f2d346b69a352a6eb':
Further optimize media scanner.
Marco Nelissen [Mon, 13 Feb 2012 23:47:58 +0000 (15:47 -0800)]
Merge "Further optimize media scanner."
Makoto Onuki [Mon, 13 Feb 2012 23:22:02 +0000 (15:22 -0800)]
am
75400e77: Merge "Fix the 3-parameter formatNumber to correctly handle IDDs."
* commit '
75400e775e7f291720aa43fbe6bf2b4ab41265b1':
Fix the 3-parameter formatNumber to correctly handle IDDs.
Ramanan Rajeswaran [Mon, 13 Feb 2012 21:53:39 +0000 (13:53 -0800)]
DO NOT MERGE
Revert "Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc."
This reverts commit
c1496d2d9a496e4aba817a58ecb9e07fe55cdba5.
Change-Id: If60df742b19c925cc99b20d01108b84415b124ad
Makoto Onuki [Mon, 13 Feb 2012 23:20:40 +0000 (15:20 -0800)]
Merge "Fix the 3-parameter formatNumber to correctly handle IDDs."
Jeff Brown [Mon, 13 Feb 2012 23:06:47 +0000 (15:06 -0800)]
am
dc38fd4c: Merge "Don\'t serialize motion events."
* commit '
dc38fd4c736b2beebfe5a77c79d2088ad3816a4d':
Don't serialize motion events.
Jeff Brown [Mon, 13 Feb 2012 23:04:33 +0000 (15:04 -0800)]
Merge "Don't serialize motion events."
Fabrice Di Meglio [Mon, 13 Feb 2012 23:01:22 +0000 (15:01 -0800)]
am
f53b451c: Merge "Update BiDiTest app for GridLayout RTL tests"
* commit '
f53b451c4c60ddccb99624d5fd40733715e7a7fa':
Update BiDiTest app for GridLayout RTL tests
Fabrice Di Meglio [Mon, 13 Feb 2012 22:58:53 +0000 (14:58 -0800)]
Merge "Update BiDiTest app for GridLayout RTL tests"
Tsu Chiang Chuang [Mon, 13 Feb 2012 22:45:23 +0000 (14:45 -0800)]
am
42a3e79d: am
8885596a: am
3ded587c: am
08eb7dd6: Merge "extending timeout to stabilize tests" into ics-mr1
* commit '
42a3e79d5ab5fb9d52b2bd3ea7d016d4b76e23e1':
Dianne Hackborn [Mon, 13 Feb 2012 22:45:21 +0000 (14:45 -0800)]
am
d2a4c2fa: am
84affb8a: Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
* commit '
d2a4c2fa8fdaeb6bc4a51cb26b3419c5e5e1c083':
Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
Tsu Chiang Chuang [Mon, 13 Feb 2012 22:42:42 +0000 (14:42 -0800)]
am
8885596a: am
3ded587c: am
08eb7dd6: Merge "extending timeout to stabilize tests" into ics-mr1
* commit '
8885596a9109794ebd61e6a91e5199aa1750ed8c':