OSDN Git Service
Daniel Sandler [Thu, 8 Dec 2011 01:43:39 +0000 (17:43 -0800)]
am
b490d8d6: am
29933fb2: Merge "Improve handling of small largeIcons in tablet ticker." into ics-mr1
* commit '
b490d8d6214114391622b4302ca2f5f39b2166c6':
Improve handling of small largeIcons in tablet ticker.
Daniel Sandler [Thu, 8 Dec 2011 01:42:07 +0000 (17:42 -0800)]
am
29933fb2: Merge "Improve handling of small largeIcons in tablet ticker." into ics-mr1
* commit '
29933fb26a4294a9bd30f9227809e28949252833':
Improve handling of small largeIcons in tablet ticker.
Daniel Sandler [Thu, 8 Dec 2011 01:40:07 +0000 (17:40 -0800)]
Merge "Improve handling of small largeIcons in tablet ticker." into ics-mr1
Joe Malin [Thu, 8 Dec 2011 01:17:09 +0000 (17:17 -0800)]
am
bea42859: am
aa2719df: am
3937e055: Merge "DOC CHANGE: Add text for android.os.storage" into ics-mr0
* commit '
bea4285934b4cd5bab21f7c69ac82d871b6ee05f':
DOC CHANGE: Add text for android.os.storage
Dianne Hackborn [Thu, 8 Dec 2011 01:17:07 +0000 (17:17 -0800)]
am
7377e593: am
0e385ee4: am
b32785c6: Merge "More fixing for issue #
5366535: Lockscreen has wrong layout..." into ics-mr0
* commit '
7377e59314885b8ef65bd19d04984998cb2e5ff4':
More fixing for issue #
5366535: Lockscreen has wrong layout...
Dianne Hackborn [Thu, 8 Dec 2011 01:14:48 +0000 (17:14 -0800)]
am
2657d889: (-s ours) am
b259c04d: Merge "Merge commit \'
eee12419\' into manualmerge" into ics-mr1
* commit '
2657d889ea7e60f5d97926dc7720e9780b6796e0':
DO NOT MERGE. Integrate from MR 1 to fix issue #
5366535: Lockscreen...
Joe Malin [Thu, 8 Dec 2011 01:14:47 +0000 (17:14 -0800)]
am
aa2719df: am
3937e055: Merge "DOC CHANGE: Add text for android.os.storage" into ics-mr0
* commit '
aa2719df72225402737009b1cc2e3cfea8e74bc7':
DOC CHANGE: Add text for android.os.storage
Dianne Hackborn [Thu, 8 Dec 2011 01:14:46 +0000 (17:14 -0800)]
am
0e385ee4: am
b32785c6: Merge "More fixing for issue #
5366535: Lockscreen has wrong layout..." into ics-mr0
* commit '
0e385ee4de901f4c509374fad5bc040a2ac80721':
More fixing for issue #
5366535: Lockscreen has wrong layout...
Robert Greenwalt [Thu, 8 Dec 2011 01:12:47 +0000 (17:12 -0800)]
am
4741163c: am
fbb09ea8: Merge "Fix NPE in trimV4AddrZeros." into ics-mr1
* commit '
4741163cd719ce88eddf17ebb0a3ffd6a8044fbe':
Fix NPE in trimV4AddrZeros.
Dianne Hackborn [Thu, 8 Dec 2011 01:12:43 +0000 (17:12 -0800)]
am
b259c04d: Merge "Merge commit \'
eee12419\' into manualmerge" into ics-mr1
* commit '
b259c04d4321536ef9f5cc9b55079d3bd450eef7':
DO NOT MERGE. Integrate from MR 1 to fix issue #
5366535: Lockscreen...
Joe Malin [Thu, 8 Dec 2011 01:11:59 +0000 (17:11 -0800)]
am
3937e055: Merge "DOC CHANGE: Add text for android.os.storage" into ics-mr0
* commit '
3937e055708a8618f184feab204fed4bb41f3f6e':
DOC CHANGE: Add text for android.os.storage
Dianne Hackborn [Thu, 8 Dec 2011 01:11:57 +0000 (17:11 -0800)]
am
b32785c6: Merge "More fixing for issue #
5366535: Lockscreen has wrong layout..." into ics-mr0
* commit '
b32785c6e893743956e28b285b8e6f6fc7aa8edb':
More fixing for issue #
5366535: Lockscreen has wrong layout...
Robert Greenwalt [Thu, 8 Dec 2011 01:10:37 +0000 (17:10 -0800)]
am
fbb09ea8: Merge "Fix NPE in trimV4AddrZeros." into ics-mr1
* commit '
fbb09ea84f7a9df94358f05f4e680cb363bae663':
Fix NPE in trimV4AddrZeros.
Dianne Hackborn [Thu, 8 Dec 2011 01:10:34 +0000 (17:10 -0800)]
Merge "Merge commit '
eee12419' into manualmerge" into ics-mr1
Robert Greenwalt [Thu, 8 Dec 2011 01:09:05 +0000 (17:09 -0800)]
Merge "Fix NPE in trimV4AddrZeros." into ics-mr1
Amith Yamasani [Thu, 8 Dec 2011 00:58:45 +0000 (16:58 -0800)]
am
675a5ba8: am
3b5555fc: Merge "Make new ringer toggles on power menu accessible and navigable with keyboard." into ics-mr1
* commit '
675a5ba82f886d8a5f954219b6544a97acb17e29':
Make new ringer toggles on power menu accessible and navigable with keyboard.
Amith Yamasani [Thu, 8 Dec 2011 00:56:17 +0000 (16:56 -0800)]
am
3b5555fc: Merge "Make new ringer toggles on power menu accessible and navigable with keyboard." into ics-mr1
* commit '
3b5555fc4483f6813f3df4787d98dd5357851566':
Make new ringer toggles on power menu accessible and navigable with keyboard.
Amith Yamasani [Thu, 8 Dec 2011 00:54:31 +0000 (16:54 -0800)]
Merge "Make new ringer toggles on power menu accessible and navigable with keyboard." into ics-mr1
Eric Laurent [Thu, 8 Dec 2011 00:45:07 +0000 (16:45 -0800)]
Merge "Fix audio effect tests"
Daniel Sandler [Thu, 8 Dec 2011 00:38:12 +0000 (16:38 -0800)]
am
940a49c8: am
dc8cb9aa: Merge "Invalidate the whole status bar after layout transitions." into ics-mr1
* commit '
940a49c89c0ccca8ba38028c209a4a135b23dd8f':
Invalidate the whole status bar after layout transitions.
Daniel Sandler [Thu, 8 Dec 2011 00:35:46 +0000 (16:35 -0800)]
am
dc8cb9aa: Merge "Invalidate the whole status bar after layout transitions." into ics-mr1
* commit '
dc8cb9aa7e8f341ab88ae57e9d2cb99502844e5b':
Invalidate the whole status bar after layout transitions.
Daniel Sandler [Thu, 8 Dec 2011 00:33:31 +0000 (16:33 -0800)]
Merge "Invalidate the whole status bar after layout transitions." into ics-mr1
Dianne Hackborn [Thu, 8 Dec 2011 00:33:15 +0000 (16:33 -0800)]
Merge commit '
eee12419' into manualmerge
Russell Brenner [Thu, 8 Dec 2011 00:24:06 +0000 (16:24 -0800)]
am
9a8a7be7: am
1662a874: Merge "Update Armenian and Georgian fonts" into ics-mr1
* commit '
9a8a7be701b42cefc8da464c1d1436c78383095f':
Update Armenian and Georgian fonts
Russell Brenner [Thu, 8 Dec 2011 00:22:24 +0000 (16:22 -0800)]
am
1662a874: Merge "Update Armenian and Georgian fonts" into ics-mr1
* commit '
1662a874fb65b915b6c3d8a213c1bd0c718059b5':
Update Armenian and Georgian fonts
Russell Brenner [Thu, 8 Dec 2011 00:20:15 +0000 (16:20 -0800)]
Merge "Update Armenian and Georgian fonts" into ics-mr1
Joe Malin [Thu, 8 Dec 2011 00:07:49 +0000 (16:07 -0800)]
Merge "DOC CHANGE: Add text for android.os.storage" into ics-mr0
Jeff Brown [Thu, 8 Dec 2011 00:05:48 +0000 (16:05 -0800)]
am
03be4d9c: am
ff3b5a82: Merge "Make the dock orientation override the HDMI orientation." into ics-mr1
* commit '
03be4d9cf456b7ad82e6fbbdea2b4902cb0e4abb':
Make the dock orientation override the HDMI orientation.
Dianne Hackborn [Thu, 8 Dec 2011 00:05:46 +0000 (16:05 -0800)]
am
95c7cd56: am
87e06ec2: Merge "Fix issue #
5144065: Tap on Music icon from Home screen..." into ics-mr1
* commit '
95c7cd56cc12179ad00623422814e8ba16646c34':
Fix issue #
5144065: Tap on Music icon from Home screen...
Jeff Brown [Thu, 8 Dec 2011 00:03:57 +0000 (16:03 -0800)]
am
ff3b5a82: Merge "Make the dock orientation override the HDMI orientation." into ics-mr1
* commit '
ff3b5a828ea1f7409af4475898689804bed10ede':
Make the dock orientation override the HDMI orientation.
Dianne Hackborn [Thu, 8 Dec 2011 00:03:56 +0000 (16:03 -0800)]
am
87e06ec2: Merge "Fix issue #
5144065: Tap on Music icon from Home screen..." into ics-mr1
* commit '
87e06ec2fa57a54b92fe82f2cacfbf8a44e47baf':
Fix issue #
5144065: Tap on Music icon from Home screen...
Roman Nurik [Wed, 7 Dec 2011 23:54:16 +0000 (15:54 -0800)]
Merge "Cherry: Reduce file size for ADL presentation shareable."
Roman Nurik [Wed, 7 Dec 2011 23:54:14 +0000 (15:54 -0800)]
Merge "Cherry: Add Q3 2011 ADL slides to docs/shareables/adl"
Dianne Hackborn [Wed, 7 Dec 2011 23:22:21 +0000 (15:22 -0800)]
Merge "More fixing for issue #
5366535: Lockscreen has wrong layout..." into ics-mr0
Jeff Brown [Wed, 7 Dec 2011 23:04:39 +0000 (15:04 -0800)]
Merge "Make the dock orientation override the HDMI orientation." into ics-mr1
Dianne Hackborn [Wed, 7 Dec 2011 23:01:55 +0000 (15:01 -0800)]
Merge "Fix issue #
5144065: Tap on Music icon from Home screen..." into ics-mr1
Dianne Hackborn [Wed, 7 Dec 2011 23:00:05 +0000 (15:00 -0800)]
Merge "DO NOT MERGE. Integrate from MR 1 to fix issue #
5366535: Lockscreen..." into ics-mr0
Svetoslav Ganov [Wed, 7 Dec 2011 22:38:05 +0000 (14:38 -0800)]
Merge "Make the URL for the JavaScript based screen-reader used by WebView configurable."
Winson Chung [Wed, 7 Dec 2011 22:36:34 +0000 (14:36 -0800)]
am
a21ce1f1: am
0a361b10: Merge "Workaround for issue where the notifyDatasetChanged call chain is broken when Launcher is killed. (Bug
5703782)" into ics-mr1
* commit '
a21ce1f1107e1aad19335bebe4aed915158b5ca6':
Workaround for issue where the notifyDatasetChanged call chain is broken when Launcher is killed. (Bug
5703782)
Winson Chung [Wed, 7 Dec 2011 22:35:04 +0000 (14:35 -0800)]
am
0a361b10: Merge "Workaround for issue where the notifyDatasetChanged call chain is broken when Launcher is killed. (Bug
5703782)" into ics-mr1
* commit '
0a361b10a665a3d158c846722290f26ce62276e1':
Workaround for issue where the notifyDatasetChanged call chain is broken when Launcher is killed. (Bug
5703782)
Winson Chung [Wed, 7 Dec 2011 22:33:31 +0000 (14:33 -0800)]
Merge "Workaround for issue where the notifyDatasetChanged call chain is broken when Launcher is killed. (Bug
5703782)" into ics-mr1
Mathias Agopian [Wed, 7 Dec 2011 22:15:21 +0000 (14:15 -0800)]
Merge "Improve the VSYNC api a bit."
Dave Burke [Wed, 7 Dec 2011 22:11:14 +0000 (14:11 -0800)]
am
6727a43f: am
54a53841: Merge "Fetch at least 192KB to avoid our mp3 sniffer from blocking on data." into ics-mr1
* commit '
6727a43f6d8ff193b86ca90b2daa761c47157638':
Fetch at least 192KB to avoid our mp3 sniffer from blocking on data.
Dave Burke [Wed, 7 Dec 2011 22:08:13 +0000 (14:08 -0800)]
am
54a53841: Merge "Fetch at least 192KB to avoid our mp3 sniffer from blocking on data." into ics-mr1
* commit '
54a53841a9ff48ba4cd004469ae4ff77caed900a':
Fetch at least 192KB to avoid our mp3 sniffer from blocking on data.
Dave Burke [Wed, 7 Dec 2011 22:05:41 +0000 (14:05 -0800)]
Merge "Fetch at least 192KB to avoid our mp3 sniffer from blocking on data." into ics-mr1
Robert Greenwalt [Wed, 7 Dec 2011 21:19:37 +0000 (13:19 -0800)]
Robert Greenwalt [Wed, 7 Dec 2011 21:17:04 +0000 (13:17 -0800)]
Robert Greenwalt [Wed, 7 Dec 2011 20:33:24 +0000 (12:33 -0800)]
am
2ebd3612: am
f352491a: Merge "Trim leading zeros from ipv4 addrs." into ics-mr1
* commit '
2ebd3612d82f728873f87cdbea9fa5513b5cfb39':
Trim leading zeros from ipv4 addrs.
Robert Greenwalt [Wed, 7 Dec 2011 20:31:11 +0000 (12:31 -0800)]
am
f352491a: Merge "Trim leading zeros from ipv4 addrs." into ics-mr1
* commit '
f352491aad71b5c0a30238707bdb83c9dc34fd9e':
Trim leading zeros from ipv4 addrs.
Robert Greenwalt [Wed, 7 Dec 2011 20:29:14 +0000 (12:29 -0800)]
Merge "Trim leading zeros from ipv4 addrs." into ics-mr1
Irfan Sheriff [Wed, 7 Dec 2011 20:10:58 +0000 (12:10 -0800)]
am
8c2122cb: am
a85cc282: Merge "Fix CS wakelock handling" into ics-mr1
* commit '
8c2122cb3e347c607126c49d76fb165125a02295':
Fix CS wakelock handling
Irfan Sheriff [Wed, 7 Dec 2011 20:08:41 +0000 (12:08 -0800)]
am
a85cc282: Merge "Fix CS wakelock handling" into ics-mr1
* commit '
a85cc28229c2d5114fcc83c3d7ebfd6894fd4b98':
Fix CS wakelock handling
Irfan Sheriff [Wed, 7 Dec 2011 20:06:31 +0000 (12:06 -0800)]
Merge "Fix CS wakelock handling" into ics-mr1
Bart Sears [Wed, 7 Dec 2011 19:46:11 +0000 (11:46 -0800)]
am
654ac45c: am
b56076ac: Merge "Fix WebTextView rings" into ics-mr1
* commit '
654ac45c21b257613957c8c172a3fdff79903fcd':
Fix WebTextView rings
Bart Sears [Wed, 7 Dec 2011 19:43:54 +0000 (11:43 -0800)]
am
b56076ac: Merge "Fix WebTextView rings" into ics-mr1
* commit '
b56076ac9f5ece5995363952e85d6dd8e4620e27':
Fix WebTextView rings
Bart Sears [Wed, 7 Dec 2011 19:41:57 +0000 (11:41 -0800)]
Merge "Fix WebTextView rings" into ics-mr1
Joe Malin [Wed, 7 Dec 2011 19:33:01 +0000 (11:33 -0800)]
am
3eebad61: am
3744d1fa: am
9e2cf49f: Merge "DOC CHANGE: Add Content URI ref doc" into ics-mr0
* commit '
3eebad61b4df7f5b4c898545aa7ec9076bc077d0':
DOC CHANGE: Add Content URI ref doc
Joe Malin [Wed, 7 Dec 2011 19:30:41 +0000 (11:30 -0800)]
am
3744d1fa: am
9e2cf49f: Merge "DOC CHANGE: Add Content URI ref doc" into ics-mr0
* commit '
3744d1faf582214132b9ba000d54cdbf44425113':
DOC CHANGE: Add Content URI ref doc
Joe Malin [Wed, 7 Dec 2011 19:28:25 +0000 (11:28 -0800)]
am
9e2cf49f: Merge "DOC CHANGE: Add Content URI ref doc" into ics-mr0
* commit '
9e2cf49fa360e70b33a870e9ae0b3eec11752972':
DOC CHANGE: Add Content URI ref doc
Joe Malin [Wed, 7 Dec 2011 19:26:20 +0000 (11:26 -0800)]
Merge "DOC CHANGE: Add Content URI ref doc" into ics-mr0
Alex Sakhartchouk [Wed, 7 Dec 2011 19:07:42 +0000 (11:07 -0800)]
Merge "Fixing file writing bug"
Dianne Hackborn [Wed, 7 Dec 2011 18:49:56 +0000 (10:49 -0800)]
am
1f1fa7ed: am
fb90df8c: Merge "Truthiness is good." into ics-mr1
* commit '
1f1fa7edd608137863b863da44ee26efb5a93e23':
Truthiness is good.
Gilles Debunne [Wed, 7 Dec 2011 18:40:28 +0000 (10:40 -0800)]
Merge "Minor tweak in getLocationInWindow"
Dianne Hackborn [Wed, 7 Dec 2011 18:36:54 +0000 (10:36 -0800)]
am
fb90df8c: Merge "Truthiness is good." into ics-mr1
* commit '
fb90df8c6e6d48c4b6701014a3053915b94f4b9e':
Truthiness is good.
Dianne Hackborn [Wed, 7 Dec 2011 18:33:19 +0000 (10:33 -0800)]
Merge "Truthiness is good." into ics-mr1
The Android Open Source Project [Wed, 7 Dec 2011 15:44:31 +0000 (07:44 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ie377d01065e1c34c60a97df3725e56100bae3903
The Android Open Source Project [Wed, 7 Dec 2011 15:29:38 +0000 (07:29 -0800)]
am
6ee7bca1: (-s ours) am
3de8d36b: Reconcile with ics-mr0-release
* commit '
6ee7bca1ce7f93d33a70701bb7862c3d13e68b89':
DO NOT MERGE: Remove the AVI extractor.
Disable wifiwatchdog for now
The Android Open Source Project [Wed, 7 Dec 2011 15:27:57 +0000 (07:27 -0800)]
am
3de8d36b: Reconcile with ics-mr0-release
* commit '
3de8d36b6fd166cf63ca256c455c0ea26a849668':
DO NOT MERGE: Remove the AVI extractor.
Disable wifiwatchdog for now
The Android Open Source Project [Wed, 7 Dec 2011 15:24:54 +0000 (07:24 -0800)]
Reconcile with ics-mr0-release
Change-Id: I5341d7d7de8ec8dfa86095e8d8d45a912bb01a47
Narayan Kamath [Wed, 7 Dec 2011 12:15:43 +0000 (04:15 -0800)]
Merge "Allow data uris to be data sources"
Mathias Agopian [Wed, 7 Dec 2011 01:22:19 +0000 (17:22 -0800)]
Improve the VSYNC api a bit.
- add the ability to set the vsync delivery rate, when the rate is
set to N>1 (ie: receive every N vsync), SF process' is woken up for
all of vsync, but clients only see the every N events.
- add the concept of one-shot vsync events, with a call-back
to request the next one. currently the call-back is a binder IPC.
Change-Id: I09f71df0b0ba0d88ed997645e2e2497d553c9a1b
Irfan Sheriff [Wed, 7 Dec 2011 05:09:44 +0000 (21:09 -0800)]
am
7c92e2dc: am
8a4cd3b1: Merge "Disable poor network connection alone" into ics-mr1
* commit '
7c92e2dccb4e5cb5314455692ac32d2ccff24292':
Disable poor network connection alone
Irfan Sheriff [Wed, 7 Dec 2011 05:07:36 +0000 (21:07 -0800)]
am
8a4cd3b1: Merge "Disable poor network connection alone" into ics-mr1
* commit '
8a4cd3b1053d92ecb34628218f303343746691f4':
Disable poor network connection alone
Irfan Sheriff [Wed, 7 Dec 2011 05:06:03 +0000 (21:06 -0800)]
Merge "Disable poor network connection alone" into ics-mr1
Stephen Hines [Wed, 7 Dec 2011 02:33:42 +0000 (18:33 -0800)]
Merge "Remove warnings about unused results."
Stephen Hines [Wed, 7 Dec 2011 02:33:35 +0000 (18:33 -0800)]
Merge "NULL should not be const for RS."
Jeff Brown [Wed, 7 Dec 2011 02:09:35 +0000 (18:09 -0800)]
Merge "Disable postponing performTraversals(), for now."
Michael Jurka [Wed, 7 Dec 2011 01:37:06 +0000 (17:37 -0800)]
Merge "System bar now renders the back button for recents"
Scott Main [Wed, 7 Dec 2011 01:17:00 +0000 (17:17 -0800)]
am
0f668951: am
0a83e9d4: am
b6322a5b: docs: fix broken links bug:
5542371
* commit '
0f668951d78ad8c45af54a6c06d3c560eed29108':
docs: fix broken links bug:
5542371
Scott Main [Wed, 7 Dec 2011 01:14:50 +0000 (17:14 -0800)]
am
0a83e9d4: am
b6322a5b: docs: fix broken links bug:
5542371
* commit '
0a83e9d438f35cba62a10392fb9e7e1c577aa638':
docs: fix broken links bug:
5542371
Scott Main [Wed, 7 Dec 2011 01:12:53 +0000 (17:12 -0800)]
am
b6322a5b: docs: fix broken links bug:
5542371
* commit '
b6322a5bb9fda370cccf89434b939370dfa36b02':
docs: fix broken links bug:
5542371
Andreas Huber [Wed, 7 Dec 2011 00:59:52 +0000 (16:59 -0800)]
am
92860d5d: (-s ours) am
791a3183: Merge "Merge commit \'
babb7200\' into manualmerge" into ics-mr1
* commit '
92860d5d4681e684d5f3936137c6c067c950121e':
DO NOT MERGE: Remove the AVI extractor.
Fabrice Di Meglio [Wed, 7 Dec 2011 00:59:50 +0000 (16:59 -0800)]
am
59685954: (-s ours) am
1e994211: Merge "Fix TextLayoutCache issue when loading Font tables (DO NOT MERGE)" into ics-mr1
* commit '
596859549254a63c619fdc403e49e809751ab832':
Fix TextLayoutCache issue when loading Font tables (DO NOT MERGE)
Hong Teng [Wed, 7 Dec 2011 00:59:45 +0000 (16:59 -0800)]
am
2be608f8: am
6db79c35: Merge "Fix for issue
5712743 video editor functional test : testPreviewDuringExport fails -Correct the invalid filename, which contains control character. And with the invalid filename, the cts fails only on crespo, but passes on stingray an
* commit '
2be608f88cd469b40a472551f22a9d40903beede':
Fix for issue
5712743 video editor functional test : testPreviewDuringExport fails -Correct the invalid filename, which contains control character. And with the invalid filename, the cts fails only on crespo, but passes on stingray and prime.
Amith Yamasani [Wed, 7 Dec 2011 00:59:44 +0000 (16:59 -0800)]
am
d49ec62c: am
f3364080: Merge "New and improved silent mode on lockscreen." into ics-mr1
* commit '
d49ec62cfb0469c39f2b5d79cbf2a6f69cceb7d7':
New and improved silent mode on lockscreen.
Adam Powell [Wed, 7 Dec 2011 00:57:35 +0000 (16:57 -0800)]
Merge "resolved conflicts for merge of
6a828712 to master"
The Android Automerger [Wed, 7 Dec 2011 00:54:17 +0000 (16:54 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Adam Powell [Wed, 7 Dec 2011 00:40:49 +0000 (16:40 -0800)]
resolved conflicts for merge of
6a828712 to master
Change-Id: I73c804667a890bcc9924951ff655137c1345541a
Jeff Brown [Wed, 7 Dec 2011 00:47:29 +0000 (16:47 -0800)]
Merge "Add tap and swipe capabilities to the "input" tool."
Romain Guy [Wed, 7 Dec 2011 00:37:58 +0000 (16:37 -0800)]
Merge "Discard framebuffer rendering queues when discarding layers Bug #
5581817"
Andreas Huber [Wed, 7 Dec 2011 00:22:07 +0000 (16:22 -0800)]
am
791a3183: Merge "Merge commit \'
babb7200\' into manualmerge" into ics-mr1
* commit '
791a31832ab586f056c2bcab8e0515d4bb1e2f7a':
DO NOT MERGE: Remove the AVI extractor.
Andreas Huber [Wed, 7 Dec 2011 00:20:01 +0000 (16:20 -0800)]
Merge "Merge commit '
babb7200' into manualmerge" into ics-mr1
Jeff Brown [Wed, 7 Dec 2011 00:18:03 +0000 (16:18 -0800)]
Merge "Fix PIN pad."
James Dong [Wed, 7 Dec 2011 00:04:38 +0000 (16:04 -0800)]
am
49782b81: (-s ours) am
6b8b5a0a: Merge "DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames" into ics-mr1
* commit '
49782b8100a752056f044f6f3f1cf16a6a1f03b4':
DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames
Andreas Huber [Wed, 7 Dec 2011 00:04:36 +0000 (16:04 -0800)]
am
c4738293: (-s ours) am
05d63069: Merge "DO NOT MERGE: Remove the AVI extractor." into ics-mr1
* commit '
c4738293527618f9a228c3f0f645c0a0704ada9c':
DO NOT MERGE: Remove the AVI extractor.
Irfan Sheriff [Wed, 7 Dec 2011 00:04:30 +0000 (16:04 -0800)]
am
5e2e7d5f: am
40cb30c2: am
7b62313e: Disable wifiwatchdog for now
* commit '
5e2e7d5fb81266640f8284abb25fe8be06693f5b':
Disable wifiwatchdog for now
Gilles Debunne [Tue, 6 Dec 2011 23:57:47 +0000 (15:57 -0800)]
resolved conflicts for merge of
fb729202 to master
Change-Id: Ic571594b14f2822094d5c1aa4c4b1e9da4a2eae0
Fabrice Di Meglio [Tue, 6 Dec 2011 23:49:29 +0000 (15:49 -0800)]
am
1e994211: Merge "Fix TextLayoutCache issue when loading Font tables (DO NOT MERGE)" into ics-mr1
* commit '
1e99421196c1b34363267d6e6f02b16a299c9012':
Fix TextLayoutCache issue when loading Font tables (DO NOT MERGE)
Fabrice Di Meglio [Tue, 6 Dec 2011 23:47:27 +0000 (15:47 -0800)]
Merge "Fix TextLayoutCache issue when loading Font tables (DO NOT MERGE)" into ics-mr1
Hong Teng [Tue, 6 Dec 2011 23:39:37 +0000 (15:39 -0800)]
am
6db79c35: Merge "Fix for issue
5712743 video editor functional test : testPreviewDuringExport fails -Correct the invalid filename, which contains control character. And with the invalid filename, the cts fails only on crespo, but passes on stingray and prime." int
* commit '
6db79c35c0cb4e26c6aff4a913777fd21069fd3c':
Fix for issue
5712743 video editor functional test : testPreviewDuringExport fails -Correct the invalid filename, which contains control character. And with the invalid filename, the cts fails only on crespo, but passes on stingray and prime.