Kenny Root
1635e522e0
am 99f8c5ee: Merge "Fix location of gdbserver upon installation" into gingerbread
...
Merge commit '99f8c5ee621d78a24583a10e459ba40aab511a17' into gingerbread-plus-aosp
* commit '99f8c5ee621d78a24583a10e459ba40aab511a17':
Fix location of gdbserver upon installation
2010-09-30 14:30:14 -07:00
Kenny Root
9e681f5374
Merge "Fix location of gdbserver upon installation" into gingerbread
2010-09-30 14:27:15 -07:00
Mike Lockwood
06ddd4c77f
am 727d67d4: Merge "location: rebind to network location and geocoder services after package update" into gingerbread
...
Merge commit '727d67d4fb8721b0291312e4cca33927dfba0e31' into gingerbread-plus-aosp
* commit '727d67d4fb8721b0291312e4cca33927dfba0e31':
location: rebind to network location and geocoder services after package update
2010-09-30 13:10:50 -07:00
Mike Lockwood
33756f1947
Merge "location: rebind to network location and geocoder services after package update" into gingerbread
2010-09-30 13:07:06 -07:00
Dianne Hackborn
df5b6d9694
am 1bfbf19b: Merge "Fix night/notnight resource folder handling." into gingerbread
...
Merge commit '1bfbf19bd93567d75d1f62c0ee3a81dddc7cc895' into gingerbread-plus-aosp
* commit '1bfbf19bd93567d75d1f62c0ee3a81dddc7cc895':
Fix night/notnight resource folder handling.
2010-09-30 12:43:55 -07:00
Dianne Hackborn
23beef51fd
Merge "Fix night/notnight resource folder handling." into gingerbread
2010-09-30 12:40:52 -07:00
Paul Westbrook
72409a4a0b
am fcf1948a: Moved Rfc822 validator test
...
Merge commit 'fcf1948aeb0b548d1f89890d58baefd008880cb7' into gingerbread-plus-aosp
* commit 'fcf1948aeb0b548d1f89890d58baefd008880cb7':
Moved Rfc822 validator test
2010-09-30 11:45:05 -07:00
Steve Howard
b5543cde51
am cdcc0a65: Merge "Have download manager give more details when downloads are paused" into gingerbread
...
Merge commit 'cdcc0a65fae7e649f0f07e396dbe0dd59ceffada' into gingerbread-plus-aosp
* commit 'cdcc0a65fae7e649f0f07e396dbe0dd59ceffada':
Have download manager give more details when downloads are paused
2010-09-30 11:42:16 -07:00
Steve Howard
db6a8843ef
Merge "Have download manager give more details when downloads are paused" into gingerbread
2010-09-30 11:11:16 -07:00
Wu-cheng Li
2cb06ac028
am 2fb818ca: Fix the javadoc of Parameters.setRotation.
...
Merge commit '2fb818ca7dd53d00646854a2473f1a69be43067c' into gingerbread-plus-aosp
* commit '2fb818ca7dd53d00646854a2473f1a69be43067c':
Fix the javadoc of Parameters.setRotation.
2010-09-30 11:07:23 -07:00
Chia-chi Yeh
5b0de90f96
am 20cb2310: Merge "KeyStore: Initialize IV correctly." into gingerbread
...
Merge commit '20cb2310cffb787c54016d50b9b5fe320fc5b025' into gingerbread-plus-aosp
* commit '20cb2310cffb787c54016d50b9b5fe320fc5b025':
KeyStore: Initialize IV correctly.
2010-09-30 10:11:16 -07:00
Chia-chi Yeh
06d4a936de
am 21ae1ad6: RTP: Minor fixes with polishing.
...
Merge commit '21ae1ad6a695d6f1f253797fcf2a77b975b82cd3' into gingerbread-plus-aosp
* commit '21ae1ad6a695d6f1f253797fcf2a77b975b82cd3':
RTP: Minor fixes with polishing.
2010-09-30 10:11:07 -07:00
Chia-chi Yeh
f3e1e2b617
am 2cbb56f9: Merge "KeyStore: Fix the return value when send() or recv() has an error." into gingerbread
...
Merge commit '2cbb56f961e4893a3bf7ded560d4bdbf45eabd01' into gingerbread-plus-aosp
* commit '2cbb56f961e4893a3bf7ded560d4bdbf45eabd01':
KeyStore: Fix the return value when send() or recv() has an error.
2010-09-30 10:10:59 -07:00
Hung-ying Tyan
eced15c440
am d29e0754: Merge "Add uri field to SipManager.ListenerRelay" into gingerbread
...
Merge commit 'd29e0754183e4b3945eb7cabae91cd3df47ae4d6' into gingerbread-plus-aosp
* commit 'd29e0754183e4b3945eb7cabae91cd3df47ae4d6':
Add uri field to SipManager.ListenerRelay
2010-09-30 10:10:52 -07:00
Chia-chi Yeh
52dd08bb76
am dfd1484e: Merge "RTP: Adjust the jitter buffer to 512ms." into gingerbread
...
Merge commit 'dfd1484e3ba9c305730ccb39859919ca0e97d720' into gingerbread-plus-aosp
* commit 'dfd1484e3ba9c305730ccb39859919ca0e97d720':
RTP: Adjust the jitter buffer to 512ms.
2010-09-30 10:10:46 -07:00
Hung-ying Tyan
726d8d503b
am 6a53489a: SipService: add UID check.
...
Merge commit '6a53489ae594d7cc373a00687d6ea2f23d0634df' into gingerbread-plus-aosp
* commit '6a53489ae594d7cc373a00687d6ea2f23d0634df':
SipService: add UID check.
2010-09-30 10:10:41 -07:00
Adam Powell
f9f60b3866
am bc87ada1: Merge "Fix text anchors" into gingerbread
...
Merge commit 'bc87ada10de34c2d7b1301af86d94ed7c4801120' into gingerbread-plus-aosp
* commit 'bc87ada10de34c2d7b1301af86d94ed7c4801120':
Fix text anchors
2010-09-30 10:10:34 -07:00
Jeff Brown
71e6917bbc
am 5068ad8d: Revert orientation change.
...
Merge commit '5068ad8d2396d6d7bfbdb1c2c3fe57104744f1f9' into gingerbread-plus-aosp
* commit '5068ad8d2396d6d7bfbdb1c2c3fe57104744f1f9':
Revert orientation change.
2010-09-30 10:10:20 -07:00
Robert Greenwalt
6735e36252
am e8dd7160: Merge "Change the 0_fully signal icon to the new style" into gingerbread
...
Merge commit 'e8dd7160146803db6660fa10ab3e4f1d41e46c5b' into gingerbread-plus-aosp
* commit 'e8dd7160146803db6660fa10ab3e4f1d41e46c5b':
Change the 0_fully signal icon to the new style
2010-09-30 10:10:14 -07:00
Jeff Brown
e16bb02a38
am 93e3296f: Merge "PointerLocationView: Display orientation correctly." into gingerbread
...
Merge commit '93e3296f946bf54e0f8172c9d26355d9a65c878f' into gingerbread-plus-aosp
* commit '93e3296f946bf54e0f8172c9d26355d9a65c878f':
PointerLocationView: Display orientation correctly.
2010-09-30 10:10:09 -07:00
Chia-chi Yeh
4dca7ba98a
am 0a537b78: Merge "RTP: Enable AMR codec." into gingerbread
...
Merge commit '0a537b78d3fb4db86411d745b2696459d6b98ef6' into gingerbread-plus-aosp
* commit '0a537b78d3fb4db86411d745b2696459d6b98ef6':
RTP: Enable AMR codec.
2010-09-30 10:10:02 -07:00
Hung-ying Tyan
dbe52c0a08
am 2365b78e: Merge "SIP: misc fixes." into gingerbread
...
Merge commit '2365b78e64feaa9527efb15bf4ac207a837f2b45' into gingerbread-plus-aosp
* commit '2365b78e64feaa9527efb15bf4ac207a837f2b45':
SIP: misc fixes.
2010-09-30 10:09:53 -07:00
Hung-ying Tyan
45c9dae7f0
am 0e412304: Catch exceptions in SipPhone.canTake().
...
Merge commit '0e412304813ccd3a3fb6a643836e4f0922d1dc44' into gingerbread-plus-aosp
* commit '0e412304813ccd3a3fb6a643836e4f0922d1dc44':
Catch exceptions in SipPhone.canTake().
2010-09-30 10:09:39 -07:00
Hung-ying Tyan
3d9bb61170
am 421c34c1: SipPhone: revise hangup() in SipCall and SipConnection.
...
Merge commit '421c34c162098efe870574844a7ee49812bbb929' into gingerbread-plus-aosp
* commit '421c34c162098efe870574844a7ee49812bbb929':
SipPhone: revise hangup() in SipCall and SipConnection.
2010-09-30 10:09:33 -07:00
Gilles Debunne
3a716dfd06
am 71e24862: Merge "New assets for status bar data_edge and overscroll" into gingerbread
...
Merge commit '71e2486209856d33d027389be2bd4924a03c4f86' into gingerbread-plus-aosp
* commit '71e2486209856d33d027389be2bd4924a03c4f86':
New assets for status bar data_edge and overscroll
2010-09-30 10:08:38 -07:00
Ying Wang
2aa9489fea
am 3caaa64e: Merge "Fix proguard flag file dependency." into gingerbread
...
Merge commit '3caaa64e866fa3aba1d5ba3070a3b092bb835a93' into gingerbread-plus-aosp
* commit '3caaa64e866fa3aba1d5ba3070a3b092bb835a93':
Fix proguard flag file dependency.
2010-09-30 09:33:19 -07:00
Chia-chi Yeh
670a23f493
Merge "KeyStore: Initialize IV correctly." into gingerbread
2010-09-30 02:44:16 -07:00
Chia-chi Yeh
857edec1a2
KeyStore: Initialize IV correctly.
...
Change-Id: Idbf207dfcc11b92e606cbf4fd3732ed7a8aa3416
2010-09-30 17:28:01 +08:00
Chia-chi Yeh
18fc21daf5
Merge "KeyStore: Fix the return value when send() or recv() has an error." into gingerbread
2010-09-30 00:39:32 -07:00
Chia-chi Yeh
1c2eccfac3
KeyStore: Fix the return value when send() or recv() has an error.
...
Change-Id: I20a63c76bd29b1a9f8959a6c4fe5a5b8a9a971b4
2010-09-30 15:17:58 +08:00
Hung-ying Tyan
263ab1cd7d
Merge "Add uri field to SipManager.ListenerRelay" into gingerbread
2010-09-30 00:05:58 -07:00
Chia-chi Yeh
ebbc6372b2
Merge "RTP: Adjust the jitter buffer to 512ms." into gingerbread
2010-09-29 23:24:32 -07:00
Adam Powell
a5e76f4d4b
Merge "Fix text anchors" into gingerbread
2010-09-29 21:05:12 -07:00
Robert Greenwalt
e88b133a3b
Merge "Change the 0_fully signal icon to the new style" into gingerbread
2010-09-29 19:48:57 -07:00
Jeff Brown
79d3af4a2f
Merge "PointerLocationView: Display orientation correctly." into gingerbread
2010-09-29 19:08:02 -07:00
Chia-chi Yeh
ba90c5ba8f
Merge "RTP: Enable AMR codec." into gingerbread
2010-09-29 18:32:24 -07:00
Hung-ying Tyan
bd3398c440
Merge "SIP: misc fixes." into gingerbread
2010-09-29 18:12:12 -07:00
Gilles Debunne
29d9af95e5
Merge "New assets for status bar data_edge and overscroll" into gingerbread
2010-09-29 17:05:26 -07:00
Ying Wang
11be2e62e2
Merge "Fix proguard flag file dependency." into gingerbread
2010-09-29 16:13:21 -07:00
Joe Onorato
0046c53725
am 2a0b3c0d: Merge "AnimatedImageView: Stop the animation when we\'re not visible." into gingerbread
...
Merge commit '2a0b3c0d4cd98385ebfa60cc2014bdb2d7b5a7f5' into gingerbread-plus-aosp
* commit '2a0b3c0d4cd98385ebfa60cc2014bdb2d7b5a7f5':
AnimatedImageView: Stop the animation when we're not visible.
2010-09-29 14:28:03 -07:00
Joe Onorato
e78c2bde02
Merge "AnimatedImageView: Stop the animation when we're not visible." into gingerbread
2010-09-29 14:25:15 -07:00
David Brown
eeb9a9af5c
am 87fbcc2b: Merge "Implement contacts lookup (caller-id) for incoming SIP calls." into gingerbread
...
Merge commit '87fbcc2b73b9b92d50c4520053bfc7bdff4cd91b' into gingerbread-plus-aosp
* commit '87fbcc2b73b9b92d50c4520053bfc7bdff4cd91b':
Implement contacts lookup (caller-id) for incoming SIP calls.
2010-09-29 14:10:37 -07:00
David Brown
b3df9fdb39
Merge "Implement contacts lookup (caller-id) for incoming SIP calls." into gingerbread
2010-09-29 14:08:31 -07:00
Doug Zongker
16f1ddba0f
am 981dec69: Merge "don\'t delete /cache/recovery/last_log on boot" into gingerbread
...
Merge commit '981dec695f83eb51935fcf480ecbd76ae3f7d6c4' into gingerbread-plus-aosp
* commit '981dec695f83eb51935fcf480ecbd76ae3f7d6c4':
don't delete /cache/recovery/last_log on boot
2010-09-29 13:43:28 -07:00
Doug Zongker
8a6b6a4a4b
Merge "don't delete /cache/recovery/last_log on boot" into gingerbread
2010-09-29 13:41:00 -07:00
Jaikumar Ganesh
c2a23c1a04
am a5c742bf: Merge "Update local cache before sending intent." into gingerbread
...
Merge commit 'a5c742bfd08df55849418cd1c77065ac54d83502' into gingerbread-plus-aosp
* commit 'a5c742bfd08df55849418cd1c77065ac54d83502':
Update local cache before sending intent.
2010-09-29 13:27:38 -07:00
Jaikumar Ganesh
6ddcbd2167
Merge "Update local cache before sending intent." into gingerbread
2010-09-29 13:24:53 -07:00
Gilles Debunne
cd6b57c915
am f0fa2674: Merge "New assets: wifi signal 1, no sim card." into gingerbread
...
Merge commit 'f0fa267492353a98562d32d4359f2099df0f2fcd' into gingerbread-plus-aosp
* commit 'f0fa267492353a98562d32d4359f2099df0f2fcd':
New assets: wifi signal 1, no sim card.
2010-09-29 12:20:31 -07:00
Eric Fischer
10276a4b47
am 5f0c8fe6: Merge "Split strings with SD card references into variations." into gingerbread
...
Merge commit '5f0c8fe6516ab2327f93f1c038d8854dbcbe7ce0' into gingerbread-plus-aosp
* commit '5f0c8fe6516ab2327f93f1c038d8854dbcbe7ce0':
Split strings with SD card references into variations.
2010-09-29 12:17:28 -07:00
Chia-chi Yeh
6acfce816d
am 955ab37c: Merge "RTP: Enable GSM-EFR codec." into gingerbread
...
Merge commit '955ab37cee3b2c61e67a2f8ceca895b47f6a182c' into gingerbread-plus-aosp
* commit '955ab37cee3b2c61e67a2f8ceca895b47f6a182c':
RTP: Enable GSM-EFR codec.
2010-09-29 12:17:24 -07:00