Kenny Root
8e41fd2aa5
Merge "Grant ACCESS_ALL_DOWNLOADS to DefaultContainerService" into gingerbread
2010-12-01 14:18:23 -08:00
Scott Main
0da9cbe3f7
am 83df6ead: am a45d6937: docs: dashboard update
...
* commit '83df6ead8dfd2037e4681793d439fffa5afda9fc':
docs: dashboard update
2010-12-01 13:59:08 -08:00
Irfan Sheriff
c4b9bf2454
am f36bde82: DO NOT MERGE Dont let supplicant stay in DORMANT state
...
* commit 'f36bde828c0e427c0dbbe543b2465114c9aff45c':
DO NOT MERGE Dont let supplicant stay in DORMANT state
2010-12-01 13:59:04 -08:00
Scott Main
1e0f732364
am a45d6937: docs: dashboard update
...
* commit 'a45d693757c14c2d97a81f1fd8faa3ba38b53021':
docs: dashboard update
2010-12-01 12:59:42 -08:00
Eric Laurent
54a176320f
am e23212bc: Merge "Fix issue 3142808." into gingerbread
...
* commit 'e23212bc89bfcb3afbf8fdb5504556ead890e1a8':
Fix issue 3142808.
2010-12-01 11:28:54 -08:00
Eric Laurent
4db2fd929a
Merge "Fix issue 3142808." into gingerbread
2010-12-01 11:26:37 -08:00
John Wang
cec24879b4
am 4567847d: Add "canDial" check.
...
* commit '4567847d461afac08a80518637a0e48eff3c5247':
Add "canDial" check.
2010-12-01 11:10:42 -08:00
Irfan Sheriff
2f28b822da
resolved conflicts for merge of 52556689 to gingerbread-plus-aosp
...
Change-Id: I61ed41f03b635ee760dc4c9d01935ac9fac9703a
2010-12-01 10:40:05 -08:00
Irfan Sheriff
a29e6d9620
Merge "DO NOT MERGE Fix status fetch from supplicant" into gingerbread
2010-12-01 10:17:56 -08:00
Irfan Sheriff
d8567ca26c
am af2d3c7c: Merge "DO NOT MERGE Remove wifistatetracker lock access in BroadcastReceiver" into gingerbread
...
* commit 'af2d3c7ccebb009f31a92c1a87b0925a2891e1c4':
DO NOT MERGE Remove wifistatetracker lock access in BroadcastReceiver
2010-12-01 09:53:17 -08:00
Irfan Sheriff
d4d5dab12f
Merge "DO NOT MERGE Remove wifistatetracker lock access in BroadcastReceiver" into gingerbread
2010-12-01 09:51:27 -08:00
Jean-Baptiste Queru
6c48212132
Merge "Fix crash by "adb shell pm list permissions -f|-s""
2010-12-01 09:47:14 -08:00
Brad Fitzpatrick
994caa76a1
am 981a72a1: Merge "[don\'t auto-merge] Don\'t re-read SharedPreferences unnecessarily." into gingerbread
...
* commit '981a72a1506f7e6e42747b9aa0be2001795c6619':
[don't auto-merge] Don't re-read SharedPreferences unnecessarily.
2010-12-01 08:50:00 -08:00
Brad Fitzpatrick
e5f05b8739
Merge "[don't auto-merge] Don't re-read SharedPreferences unnecessarily." into gingerbread
2010-12-01 08:46:52 -08:00
Jean-Baptiste Queru
459ae1107f
Merge "Fix HTTP redirect missing statuscode 303 and 307"
2010-12-01 08:25:12 -08:00
Hung-ying Tyan
930f716d99
am 06e8cdc0: Fix race between ending and answering a SIP call.
...
* commit '06e8cdc0f81ead604d5adf9d7b3f982e10226fd2':
Fix race between ending and answering a SIP call.
2010-11-30 23:21:40 -08:00
Hung-ying Tyan
91a4f34689
am d7116ff1: Merge "Do not suppress error feedback during a SIP call." into gingerbread
...
* commit 'd7116ff1f0d1a3c14992273d0b899c3b71ba6d3f':
Do not suppress error feedback during a SIP call.
2010-11-30 22:55:37 -08:00
Hung-ying Tyan
415474e42a
Merge "Do not suppress error feedback during a SIP call." into gingerbread
2010-11-30 22:53:26 -08:00
David Brown
cc286aedef
am 04639ba0: Reduce the outrageous verbosity of CallerInfo.toString().
...
* commit '04639ba0a939988d00131e61458807dac650f9c3':
Reduce the outrageous verbosity of CallerInfo.toString().
2010-11-30 18:11:21 -08:00
Mathias Agopian
862cd17ec0
am b483d5cd: fix [3237242] sensormanager sensor active count gets out of sync
...
* commit 'b483d5cd134cda393824fd8e9c1a5443bd868ae6':
fix [3237242] sensormanager sensor active count gets out of sync
2010-11-30 15:51:00 -08:00
Mathias Agopian
76d1b9610e
am 186b68b7: Merge "allow rotation-vector to have 4 components" into gingerbread
...
* commit '186b68b74417e8ef73f2083769166e7785df6c30':
allow rotation-vector to have 4 components
2010-11-30 15:41:41 -08:00
Mathias Agopian
bcd69459f5
Merge "allow rotation-vector to have 4 components" into gingerbread
2010-11-30 15:38:38 -08:00
David Brown
522e448364
am 91abcb62: Merge "Fix bug 3121292: Contact photo not shown correctly for SIP calls" into gingerbread
...
* commit '91abcb624a6a873a2becbbf0f8186d6533daeb89':
Fix bug 3121292: Contact photo not shown correctly for SIP calls
2010-11-30 15:24:42 -08:00
David Brown
6d54e4370b
Merge "Fix bug 3121292: Contact photo not shown correctly for SIP calls" into gingerbread
2010-11-30 15:20:45 -08:00
Andreas Huber
38286e789d
am 30c81844: Merge "DO NOT MERGE Support for "chunked" HTTP transfer encoding." into gingerbread
...
* commit '30c818444d876dd868b84adec2416308c90f32e3':
DO NOT MERGE Support for "chunked" HTTP transfer encoding.
2010-11-30 14:32:09 -08:00
Andreas Huber
faa4e79c76
Merge "DO NOT MERGE Support for "chunked" HTTP transfer encoding." into gingerbread
2010-11-30 14:30:00 -08:00
Mathias Agopian
af2c516055
am 66cff624: Merge "Uses 4-th order low-pass for extracting gravity." into gingerbread
...
* commit '66cff624e9abd23da05ddc20698eb3e7d0fb5a17':
Uses 4-th order low-pass for extracting gravity.
2010-11-30 14:18:05 -08:00
Mathias Agopian
3bf9626696
Merge "Uses 4-th order low-pass for extracting gravity." into gingerbread
2010-11-30 14:15:23 -08:00
Andreas Huber
c45dfb3dcd
am a41c1e1d: Merge "DO NOT MERGE Upgrade to the latest version of libwebm to fix YouTube webm playback." into gingerbread
...
* commit 'a41c1e1de0d5fac57842ffe73e0a4f575fcc73fb':
DO NOT MERGE Upgrade to the latest version of libwebm to fix YouTube webm playback.
2010-11-30 14:08:56 -08:00
Andreas Huber
e0dbb934e6
Merge "DO NOT MERGE Upgrade to the latest version of libwebm to fix YouTube webm playback." into gingerbread
2010-11-30 14:06:26 -08:00
Mathias Agopian
1f00518af8
am 24754c9f: Merge "don\'t attempt to normalize the rotation vector" into gingerbread
...
* commit '24754c9f94b1bd8b176456da82a6059b2e8ded0f':
don't attempt to normalize the rotation vector
2010-11-30 14:05:44 -08:00
Mathias Agopian
048183ff24
Merge "don't attempt to normalize the rotation vector" into gingerbread
2010-11-30 14:03:43 -08:00
Robert Ly
fe29a144a2
am d06010c3: Merge "Doc change: updating ndk download and overview page" into gingerbread
...
* commit 'd06010c3735332e4e4a090a82fd70695625bc875':
Doc change: updating ndk download and overview page
2010-11-30 13:53:41 -08:00
Robert Ly
09103e07f8
Merge "Doc change: updating ndk download and overview page" into gingerbread
2010-11-30 13:51:05 -08:00
Scott Main
44aa324f68
am 54d21dad: docs: updates to the backup dev guide add sample code for performing restore and fix typos bug: 3180881,3125550,3125563
...
* commit '54d21dadf1aee8f58df65728a00ad57dbfeefb22':
docs: updates to the backup dev guide add sample code for performing restore and fix typos bug: 3180881,3125550,3125563
2010-11-30 13:30:33 -08:00
Andreas Huber
9912a639c1
am 567b2bd1: Merge "After seeking display the first new video frame right away without concern for A/V sync. This looks much more responsive to the user." into gingerbread
...
* commit '567b2bd1469b1c37e6249637d313253b7d84971e':
After seeking display the first new video frame right away without concern for A/V sync. This looks much more responsive to the user.
2010-11-30 13:07:56 -08:00
Andreas Huber
03d305cfea
Merge "After seeking display the first new video frame right away without concern for A/V sync. This looks much more responsive to the user." into gingerbread
2010-11-30 13:00:14 -08:00
Eric Laurent
aaf4046203
am 688f4c58: Merge "Update java doc for visualizer FFT capture." into gingerbread
...
* commit '688f4c58d4a7590ad47c219af3a5b8479d3a084d':
Update java doc for visualizer FFT capture.
2010-11-30 11:56:00 -08:00
Andreas Huber
fde5bc50f2
am b690e55d: Merge "DO NOT MERGE - Instead of asserting that ISurface successfully registered buffers, report an error and propagate it up to the java client." into gingerbread
...
* commit 'b690e55d3f713d68c6ed9654a05a5370bda731d5':
DO NOT MERGE - Instead of asserting that ISurface successfully registered buffers, report an error and propagate it up to the java client.
2010-11-30 11:53:01 -08:00
Eric Laurent
528648d56f
Merge "Update java doc for visualizer FFT capture." into gingerbread
2010-11-30 11:50:25 -08:00
Dirk Dougherty
915f0c59c7
am 04d2cc05: Merge "Do not merge: Doc change: API diff report for gingerbread." into gingerbread
...
* commit '04d2cc05a2a59bf61bead85d58bc4c186392d91d':
Do not merge: Doc change: API diff report for gingerbread.
2010-11-30 11:48:51 -08:00
Dirk Dougherty
e45fcf3c7a
am 50f8445e: Do not merge: Doc change: highlights and SDK version notes for Android 2.3 platform.
...
* commit '50f8445edd14a21ad86080ff7b204eefdc2c62d5':
Do not merge: Doc change: highlights and SDK version notes for Android 2.3 platform.
2010-11-30 11:48:46 -08:00
Eric Fischer
b192c271eb
am 3e6fb5d6: Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
* commit '3e6fb5d66eed34c91b9b056ad2d4c317186476fd':
Import revised translations. DO NOT MERGE
2010-11-30 11:48:00 -08:00
Wink Saville
46abef4b46
am f3166799: Merge "Fix GSM permanent failure handling, DO NOT MERGE." into gingerbread
...
* commit 'f316679971be356dbb01f991e95742bc5f2a8383':
Fix GSM permanent failure handling, DO NOT MERGE.
2010-11-30 11:46:34 -08:00
Ben Murdoch
92a9946c6b
am 27e728f2: Merge "Hide plugin views when we start playing HTML5 video" into gingerbread
...
* commit '27e728f22d954caa7252be6c19a67a9277e1db3b':
Hide plugin views when we start playing HTML5 video
2010-11-30 11:46:24 -08:00
Hung-ying Tyan
0c35b2752f
am 349f3509: Merge "Correct SipService.isOpened() implementation." into gingerbread
...
* commit '349f3509f7335bbdef443a75afa36fb3c2d9552c':
Correct SipService.isOpened() implementation.
2010-11-30 11:46:15 -08:00
Hung-ying Tyan
620d026389
am d9e12303: Merge "Notify SipSessions before closing SIP stack." into gingerbread
...
* commit 'd9e12303d279654afe16319f948f93490cd1b4d5':
Notify SipSessions before closing SIP stack.
2010-11-30 11:46:08 -08:00
Hung-ying Tyan
003a6e8edc
am 0bba9535: Merge "Throw proper exceptions in SipManager" into gingerbread
...
* commit '0bba9535413f9ceefe03f1cef9ddaddccd05cae5':
Throw proper exceptions in SipManager
2010-11-30 11:46:01 -08:00
Chia-chi Yeh
425027d179
am 683a7ff9: Merge "Visualizer: Fix the conversion from 8-bit sample to 16-bit sample." into gingerbread
...
* commit '683a7ff922409d2aa6c944bc4e08de32029e80e5':
Visualizer: Fix the conversion from 8-bit sample to 16-bit sample.
2010-11-30 11:45:54 -08:00
Irfan Sheriff
dc848fc447
am ee93169e: Merge "DO NOT MERGE fix runstate race condition" into gingerbread
...
* commit 'ee93169ed1072d3be627601223dafbcc061e7568':
DO NOT MERGE fix runstate race condition
2010-11-30 11:45:45 -08:00