Russell Brenner
fe0273b460
am 9a8a7be7: am 1662a874: Merge "Update Armenian and Georgian fonts" into ics-mr1
...
* commit '9a8a7be701b42cefc8da464c1d1436c78383095f':
Update Armenian and Georgian fonts
2011-12-07 16:24:06 -08:00
Russell Brenner
7cbc7533de
am 1662a874: Merge "Update Armenian and Georgian fonts" into ics-mr1
...
* commit '1662a874fb65b915b6c3d8a213c1bd0c718059b5':
Update Armenian and Georgian fonts
2011-12-07 16:22:24 -08:00
Russell Brenner
2952c4e0bb
Merge "Update Armenian and Georgian fonts" into ics-mr1
2011-12-07 16:20:15 -08:00
Jeff Brown
3691a8fc93
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.
2011-12-07 16:05:48 -08:00
Dianne Hackborn
f780fa213b
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...
2011-12-07 16:05:46 -08:00
Jeff Brown
7672b11588
am ff3b5a82: Merge "Make the dock orientation override the HDMI orientation." into ics-mr1
...
* commit 'ff3b5a828ea1f7409af4475898689804bed10ede':
Make the dock orientation override the HDMI orientation.
2011-12-07 16:03:57 -08:00
Dianne Hackborn
f73c9820a6
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...
2011-12-07 16:03:56 -08:00
Roman Nurik
59453853ed
Merge "Cherry: Reduce file size for ADL presentation shareable."
2011-12-07 15:54:16 -08:00
Roman Nurik
c8826a1911
Merge "Cherry: Add Q3 2011 ADL slides to docs/shareables/adl"
2011-12-07 15:54:14 -08:00
Jeff Brown
a33dec75f3
Merge "Make the dock orientation override the HDMI orientation." into ics-mr1
2011-12-07 15:04:39 -08:00
Dianne Hackborn
e26381bce5
Merge "Fix issue #5144065 : Tap on Music icon from Home screen..." into ics-mr1
2011-12-07 15:01:55 -08:00
Svetoslav Ganov
26ebefd3b9
Merge "Make the URL for the JavaScript based screen-reader used by WebView configurable."
2011-12-07 14:38:05 -08:00
Winson Chung
44c20a0cb6
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)
2011-12-07 14:36:34 -08:00
Winson Chung
e916ce4a6d
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)
2011-12-07 14:35:04 -08:00
Winson Chung
e2fe012e3d
Merge "Workaround for issue where the notifyDatasetChanged call chain is broken when Launcher is killed. (Bug 5703782)" into ics-mr1
2011-12-07 14:33:31 -08:00
Mathias Agopian
28d43b33ba
Merge "Improve the VSYNC api a bit."
2011-12-07 14:15:21 -08:00
Dave Burke
7498cd96f3
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.
2011-12-07 14:11:14 -08:00
Dave Burke
fafc6864e2
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.
2011-12-07 14:08:13 -08:00
Dave Burke
d59a3673c9
Merge "Fetch at least 192KB to avoid our mp3 sniffer from blocking on data." into ics-mr1
2011-12-07 14:05:41 -08:00
Robert Greenwalt
4b291fd8cf
am e55e5b84: am 3957b5fc: Fix the build.
...
* commit 'e55e5b84e53889791c0b6be8cad7cc134c9dfcba':
Fix the build.
2011-12-07 13:19:37 -08:00
Robert Greenwalt
9471812292
am 3957b5fc: Fix the build.
...
* commit '3957b5fc49335f13b15080b8e7146580026c0479':
Fix the build.
2011-12-07 13:17:04 -08:00
Robert Greenwalt
b11746f55f
am 2ebd3612: am f352491a: Merge "Trim leading zeros from ipv4 addrs." into ics-mr1
...
* commit '2ebd3612d82f728873f87cdbea9fa5513b5cfb39':
Trim leading zeros from ipv4 addrs.
2011-12-07 12:33:24 -08:00
Robert Greenwalt
8a67914636
am f352491a: Merge "Trim leading zeros from ipv4 addrs." into ics-mr1
...
* commit 'f352491aad71b5c0a30238707bdb83c9dc34fd9e':
Trim leading zeros from ipv4 addrs.
2011-12-07 12:31:11 -08:00
Robert Greenwalt
2c43067b5c
Merge "Trim leading zeros from ipv4 addrs." into ics-mr1
2011-12-07 12:29:14 -08:00
Irfan Sheriff
6028c3cdd4
am 8c2122cb: am a85cc282: Merge "Fix CS wakelock handling" into ics-mr1
...
* commit '8c2122cb3e347c607126c49d76fb165125a02295':
Fix CS wakelock handling
2011-12-07 12:10:58 -08:00
Irfan Sheriff
a62cec7696
am a85cc282: Merge "Fix CS wakelock handling" into ics-mr1
...
* commit 'a85cc28229c2d5114fcc83c3d7ebfd6894fd4b98':
Fix CS wakelock handling
2011-12-07 12:08:41 -08:00
Irfan Sheriff
d8e3949849
Merge "Fix CS wakelock handling" into ics-mr1
2011-12-07 12:06:31 -08:00
Bart Sears
3005c4f778
am 654ac45c: am b56076ac: Merge "Fix WebTextView rings" into ics-mr1
...
* commit '654ac45c21b257613957c8c172a3fdff79903fcd':
Fix WebTextView rings
2011-12-07 11:46:11 -08:00
Bart Sears
e2917428e2
am b56076ac: Merge "Fix WebTextView rings" into ics-mr1
...
* commit 'b56076ac9f5ece5995363952e85d6dd8e4620e27':
Fix WebTextView rings
2011-12-07 11:43:54 -08:00
Bart Sears
162fa3da8d
Merge "Fix WebTextView rings" into ics-mr1
2011-12-07 11:41:57 -08:00
Joe Malin
5dee5b84f8
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
2011-12-07 11:33:01 -08:00
Joe Malin
2c89bbb22a
am 3744d1fa: am 9e2cf49f: Merge "DOC CHANGE: Add Content URI ref doc" into ics-mr0
...
* commit '3744d1faf582214132b9ba000d54cdbf44425113':
DOC CHANGE: Add Content URI ref doc
2011-12-07 11:30:41 -08:00
Joe Malin
a457633b3f
am 9e2cf49f: Merge "DOC CHANGE: Add Content URI ref doc" into ics-mr0
...
* commit '9e2cf49fa360e70b33a870e9ae0b3eec11752972':
DOC CHANGE: Add Content URI ref doc
2011-12-07 11:28:25 -08:00
Joe Malin
62fecd5066
Merge "DOC CHANGE: Add Content URI ref doc" into ics-mr0
2011-12-07 11:26:20 -08:00
Alex Sakhartchouk
93a7f9e3ba
Merge "Fixing file writing bug"
2011-12-07 11:07:42 -08:00
Dianne Hackborn
9c40321502
am 1f1fa7ed: am fb90df8c: Merge "Truthiness is good." into ics-mr1
...
* commit '1f1fa7edd608137863b863da44ee26efb5a93e23':
Truthiness is good.
2011-12-07 10:49:56 -08:00
Gilles Debunne
a5c104809e
Merge "Minor tweak in getLocationInWindow"
2011-12-07 10:40:28 -08:00
Dianne Hackborn
47d15b157f
am fb90df8c: Merge "Truthiness is good." into ics-mr1
...
* commit 'fb90df8c6e6d48c4b6701014a3053915b94f4b9e':
Truthiness is good.
2011-12-07 10:36:54 -08:00
Dianne Hackborn
aadc681f50
Merge "Truthiness is good." into ics-mr1
2011-12-07 10:33:19 -08:00
The Android Open Source Project
1f6d428286
Reconcile with ics-mr1-release
...
Change-Id: Ie377d01065e1c34c60a97df3725e56100bae3903
2011-12-07 07:44:31 -08:00
The Android Open Source Project
13f0768ba9
am 6ee7bca1: (-s ours) am 3de8d36b: Reconcile with ics-mr0-release
...
* commit '6ee7bca1ce7f93d33a70701bb7862c3d13e68b89':
DO NOT MERGE: Remove the AVI extractor.
Disable wifiwatchdog for now
2011-12-07 07:29:38 -08:00
The Android Open Source Project
8abaab91b2
am 3de8d36b: Reconcile with ics-mr0-release
...
* commit '3de8d36b6fd166cf63ca256c455c0ea26a849668':
DO NOT MERGE: Remove the AVI extractor.
Disable wifiwatchdog for now
2011-12-07 07:27:57 -08:00
The Android Open Source Project
9e86a344c1
Reconcile with ics-mr0-release
...
Change-Id: I5341d7d7de8ec8dfa86095e8d8d45a912bb01a47
2011-12-07 07:24:54 -08:00
Narayan Kamath
d329537168
Merge "Allow data uris to be data sources"
2011-12-07 04:15:43 -08:00
Mathias Agopian
478ae5eb5a
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
2011-12-06 22:43:10 -08:00
Irfan Sheriff
fef9734b56
am 7c92e2dc: am 8a4cd3b1: Merge "Disable poor network connection alone" into ics-mr1
...
* commit '7c92e2dccb4e5cb5314455692ac32d2ccff24292':
Disable poor network connection alone
2011-12-06 21:09:44 -08:00
Irfan Sheriff
6f2e64fcf1
am 8a4cd3b1: Merge "Disable poor network connection alone" into ics-mr1
...
* commit '8a4cd3b1053d92ecb34628218f303343746691f4':
Disable poor network connection alone
2011-12-06 21:07:36 -08:00
Irfan Sheriff
17d23095d2
Merge "Disable poor network connection alone" into ics-mr1
2011-12-06 21:06:03 -08:00
Stephen Hines
c4d605f44b
Merge "Remove warnings about unused results."
2011-12-06 18:33:42 -08:00
Stephen Hines
b4b690370c
Merge "NULL should not be const for RS."
2011-12-06 18:33:35 -08:00