OSDN Git Service
Chia-chi Yeh [Fri, 1 Oct 2010 23:16:17 +0000 (16:16 -0700)]
am
9430f9d3: Merge "KeyStore: Update the parameters of generating master keys." into gingerbread
Merge commit '
9430f9d37ec169ce0654bc8950adb66ac974b761' into gingerbread-plus-aosp
* commit '
9430f9d37ec169ce0654bc8950adb66ac974b761':
KeyStore: Update the parameters of generating master keys.
Jake Hamby [Fri, 1 Oct 2010 23:02:16 +0000 (16:02 -0700)]
am
d531c9eb: Merge "Do not explicity disconnect Data during power down for 1x."
Merge commit '
d531c9ebe18f0b554d29d3c3b8e4a00f84dae97a' into gingerbread-plus-aosp
* commit '
d531c9ebe18f0b554d29d3c3b8e4a00f84dae97a':
Do not explicity disconnect Data during power down for 1x.
Scott Main [Fri, 1 Oct 2010 22:56:08 +0000 (15:56 -0700)]
am
91b0bc2a: am
32441bbe: docs: device dashboard update for 10/1
Merge commit '
91b0bc2a282f63f0ee532b5748c210bb67ba6fb3' into gingerbread-plus-aosp
* commit '
91b0bc2a282f63f0ee532b5748c210bb67ba6fb3':
docs: device dashboard update for 10/1
Hung-ying Tyan [Fri, 1 Oct 2010 22:56:02 +0000 (15:56 -0700)]
am
10e2120b: Merge "Add CallManager/Phone.setEchoSuppressionEnabled()." into gingerbread
Merge commit '
10e2120bdd2d99e100db187d49ac6a8495c7f956' into gingerbread-plus-aosp
* commit '
10e2120bdd2d99e100db187d49ac6a8495c7f956':
Add CallManager/Phone.setEchoSuppressionEnabled().
Adam Powell [Fri, 1 Oct 2010 22:55:44 +0000 (15:55 -0700)]
am
98f31087: Merge "DO NOT MERGE Fix bug
3026771, other design/asset fixes." into gingerbread
Merge commit '
98f310879790a98c4c24cd06677e08bf49f1cea0' into gingerbread-plus-aosp
* commit '
98f310879790a98c4c24cd06677e08bf49f1cea0':
DO NOT MERGE Fix bug
3026771, other design/asset fixes.
Chia-chi Yeh [Fri, 1 Oct 2010 22:34:43 +0000 (15:34 -0700)]
Merge "KeyStore: Update the parameters of generating master keys." into gingerbread
Kenny Root [Fri, 1 Oct 2010 22:11:22 +0000 (15:11 -0700)]
am
d9e88d22: Merge "Add "none" for vold and deprecate mkobb -c" into gingerbread
Merge commit '
d9e88d22f0ffefdc6a3b9c59168bd1bb6d402486' into gingerbread-plus-aosp
* commit '
d9e88d22f0ffefdc6a3b9c59168bd1bb6d402486':
Add "none" for vold and deprecate mkobb -c
Scott Main [Fri, 1 Oct 2010 22:11:10 +0000 (15:11 -0700)]
am
32441bbe: docs: device dashboard update for 10/1
Merge commit '
32441bbe61e2f02f09a319c00895aef8cfc27ff4' into gingerbread
* commit '
32441bbe61e2f02f09a319c00895aef8cfc27ff4':
docs: device dashboard update for 10/1
Jake Hamby [Fri, 1 Oct 2010 22:02:32 +0000 (15:02 -0700)]
Merge "Do not explicity disconnect Data during power down for 1x."
Hung-ying Tyan [Fri, 1 Oct 2010 21:52:00 +0000 (14:52 -0700)]
Merge "Add CallManager/Phone.setEchoSuppressionEnabled()." into gingerbread
Adam Powell [Fri, 1 Oct 2010 21:46:40 +0000 (14:46 -0700)]
Merge "DO NOT MERGE Fix bug
3026771, other design/asset fixes." into gingerbread
Dianne Hackborn [Fri, 1 Oct 2010 21:21:32 +0000 (14:21 -0700)]
Kenny Root [Fri, 1 Oct 2010 21:06:46 +0000 (14:06 -0700)]
Merge "Add "none" for vold and deprecate mkobb -c" into gingerbread
Dianne Hackborn [Fri, 1 Oct 2010 20:42:40 +0000 (13:42 -0700)]
am
1fa69735: Merge "Fix issue #
3037083: Problem report for Pinball" into gingerbread
Merge commit '
1fa69735d9e786da4b20c3ab3da3aa66f3cf8116' into gingerbread-plus-aosp
* commit '
1fa69735d9e786da4b20c3ab3da3aa66f3cf8116':
Fix issue #
3037083: Problem report for Pinball
Dianne Hackborn [Fri, 1 Oct 2010 20:39:39 +0000 (13:39 -0700)]
Merge "Fix issue #
3037083: Problem report for Pinball" into gingerbread
Steve Howard [Fri, 1 Oct 2010 20:16:17 +0000 (13:16 -0700)]
am
751b4731: Merge "A few additions to the download manager public API documentation" into gingerbread
Merge commit '
751b47313886264e1229ab67184c9771424be402' into gingerbread-plus-aosp
* commit '
751b47313886264e1229ab67184c9771424be402':
A few additions to the download manager public API documentation
Steve Howard [Fri, 1 Oct 2010 20:12:39 +0000 (13:12 -0700)]
Merge "A few additions to the download manager public API documentation" into gingerbread
Brad Fitzpatrick [Fri, 1 Oct 2010 20:05:02 +0000 (13:05 -0700)]
am
32e60c79: Update StrictMode\'s public API.
Merge commit '
32e60c7942eeba920ec5c27b372ec0899fd75a20' into gingerbread-plus-aosp
* commit '
32e60c7942eeba920ec5c27b372ec0899fd75a20':
Update StrictMode's public API.
Wei-Ta Chen [Fri, 1 Oct 2010 19:36:05 +0000 (12:36 -0700)]
am
f7681f84: Do not merge.
Merge commit '
f7681f84918c27f6a626681ce37ed2a236c44e82' into gingerbread-plus-aosp
* commit '
f7681f84918c27f6a626681ce37ed2a236c44e82':
Do not merge.
Andreas Huber [Fri, 1 Oct 2010 18:37:44 +0000 (11:37 -0700)]
am
e619a9da: Merge "Start playing live streams from the start, no the middle..." into gingerbread
Merge commit '
e619a9da44e4c00f9034917aef67f86da0bc207f' into gingerbread-plus-aosp
* commit '
e619a9da44e4c00f9034917aef67f86da0bc207f':
Start playing live streams from the start, no the middle...
Andreas Huber [Fri, 1 Oct 2010 18:35:17 +0000 (11:35 -0700)]
Merge "Start playing live streams from the start, no the middle..." into gingerbread
Fabrice Di Meglio [Fri, 1 Oct 2010 18:32:56 +0000 (11:32 -0700)]
am
73db5f02: Merge "Fix bug #
3055578 ("adb shell bmgr list sets" generates NPE and cannot be run again when device has no account setup)" into gingerbread
Merge commit '
73db5f02a1e1a3fc3514ddbff1c28e22fec3aa7a' into gingerbread-plus-aosp
* commit '
73db5f02a1e1a3fc3514ddbff1c28e22fec3aa7a':
Fix bug #
3055578 ("adb shell bmgr list sets" generates NPE and cannot be run again when device has no account setup)
Fabrice Di Meglio [Fri, 1 Oct 2010 18:30:50 +0000 (11:30 -0700)]
Merge "Fix bug #
3055578 ("adb shell bmgr list sets" generates NPE and cannot be run again when device has no account setup)" into gingerbread
Andreas Huber [Fri, 1 Oct 2010 18:25:57 +0000 (11:25 -0700)]
am
469b8033: Merge "Remove development-only code." into gingerbread
Merge commit '
469b80336368bef3742e97c15e9017c1f2d404ae' into gingerbread-plus-aosp
* commit '
469b80336368bef3742e97c15e9017c1f2d404ae':
Remove development-only code.
Andreas Huber [Fri, 1 Oct 2010 18:23:24 +0000 (11:23 -0700)]
Merge "Remove development-only code." into gingerbread
Erik [Fri, 1 Oct 2010 18:10:59 +0000 (11:10 -0700)]
am
57bd0615: Merge "b/
3054044 Make allDay event times format in utc" into gingerbread
Merge commit '
57bd0615fa48124c4607fbb1ba09a7c7160be146' into gingerbread-plus-aosp
* commit '
57bd0615fa48124c4607fbb1ba09a7c7160be146':
b/
3054044 Make allDay event times format in utc
Erik [Fri, 1 Oct 2010 18:08:13 +0000 (11:08 -0700)]
Merge "b/
3054044 Make allDay event times format in utc" into gingerbread
Andreas Huber [Fri, 1 Oct 2010 18:03:47 +0000 (11:03 -0700)]
am
d1398db3: Merge "Squashed commit of the following:" into gingerbread
Merge commit '
d1398db35cb2e4d918fc631dda35cacb8540b187' into gingerbread-plus-aosp
* commit '
d1398db35cb2e4d918fc631dda35cacb8540b187':
Squashed commit of the following:
Andreas Huber [Fri, 1 Oct 2010 18:01:33 +0000 (11:01 -0700)]
Merge "Squashed commit of the following:" into gingerbread
Kenny Root [Fri, 1 Oct 2010 15:55:53 +0000 (08:55 -0700)]
am
29423918: Fix regression in OBB key handling
Merge commit '
2942391801b79816c5eb77d7ac94c4a65f26af48' into gingerbread-plus-aosp
* commit '
2942391801b79816c5eb77d7ac94c4a65f26af48':
Fix regression in OBB key handling
Dianne Hackborn [Fri, 1 Oct 2010 02:12:11 +0000 (19:12 -0700)]
am
0a69f597: Merge "Rub in a little \'ol log-b-gone." into gingerbread
Merge commit '
0a69f597604254bc37721b135ab612eaacdd0cbd' into gingerbread-plus-aosp
* commit '
0a69f597604254bc37721b135ab612eaacdd0cbd':
Rub in a little 'ol log-b-gone.
Dianne Hackborn [Fri, 1 Oct 2010 02:03:38 +0000 (19:03 -0700)]
Merge "Rub in a little 'ol log-b-gone." into gingerbread
Joe Onorato [Fri, 1 Oct 2010 01:19:09 +0000 (18:19 -0700)]
am
ab2e6284: Merge "Use the private version of userActivity." into gingerbread
Merge commit '
ab2e6284845794079d809e62c52c6c380b31c4b5' into gingerbread-plus-aosp
* commit '
ab2e6284845794079d809e62c52c6c380b31c4b5':
Use the private version of userActivity.
Joe Onorato [Fri, 1 Oct 2010 01:12:24 +0000 (18:12 -0700)]
Merge "Use the private version of userActivity." into gingerbread
Kenny Root [Fri, 1 Oct 2010 01:06:02 +0000 (18:06 -0700)]
am
8b28441a: Merge "Being already unmounted is not a failure" into gingerbread
Merge commit '
8b28441adab59f2bb0d92c8a717af75331249e08' into gingerbread-plus-aosp
* commit '
8b28441adab59f2bb0d92c8a717af75331249e08':
Being already unmounted is not a failure
Kenny Root [Fri, 1 Oct 2010 01:03:25 +0000 (18:03 -0700)]
Merge "Being already unmounted is not a failure" into gingerbread
Chia-chi Yeh [Fri, 1 Oct 2010 01:02:38 +0000 (18:02 -0700)]
am
274e3b5d: Merge "RTP: Start AudioRecord before AudioTrack to avoid being disabled." into gingerbread
Merge commit '
274e3b5d752d1a4fd05352e50ad098d2f5b49a36' into gingerbread-plus-aosp
* commit '
274e3b5d752d1a4fd05352e50ad098d2f5b49a36':
RTP: Start AudioRecord before AudioTrack to avoid being disabled.
Eric Laurent [Fri, 1 Oct 2010 00:47:07 +0000 (17:47 -0700)]
am
220ab887: Merge "Issue
3032913: improve AudioTrack recovery time" into gingerbread
Merge commit '
220ab8877b234e6807b7f6d9028ba55d23220301' into gingerbread-plus-aosp
* commit '
220ab8877b234e6807b7f6d9028ba55d23220301':
Issue
3032913: improve AudioTrack recovery time
Chia-chi Yeh [Fri, 1 Oct 2010 00:41:09 +0000 (17:41 -0700)]
Merge "RTP: Start AudioRecord before AudioTrack to avoid being disabled." into gingerbread
Eric Laurent [Fri, 1 Oct 2010 00:39:36 +0000 (17:39 -0700)]
Merge "Issue
3032913: improve AudioTrack recovery time" into gingerbread
Kenny Root [Fri, 1 Oct 2010 00:30:37 +0000 (17:30 -0700)]
am
735de3b3: Hash keys with MD5; track IBinders not IInterface
Merge commit '
735de3b38abbd6564082a819377673ee593744a6' into gingerbread-plus-aosp
* commit '
735de3b38abbd6564082a819377673ee593744a6':
Hash keys with MD5; track IBinders not IInterface
Kenny Root [Fri, 1 Oct 2010 00:30:33 +0000 (17:30 -0700)]
am
27358a69: Only allow 8 OBBs to be mounted by a UID
Merge commit '
27358a69b33eaa268ee75ef778ec824c8085adcc' into gingerbread-plus-aosp
* commit '
27358a69b33eaa268ee75ef778ec824c8085adcc':
Only allow 8 OBBs to be mounted by a UID
Kenny Root [Fri, 1 Oct 2010 00:30:22 +0000 (17:30 -0700)]
am
38cf8867: Remove OBBs from state list when volume unmounted
Merge commit '
38cf8867a8d3e8d5159abd0bd0e6a3b0b8348b94' into gingerbread-plus-aosp
* commit '
38cf8867a8d3e8d5159abd0bd0e6a3b0b8348b94':
Remove OBBs from state list when volume unmounted
Hung-ying Tyan [Fri, 1 Oct 2010 00:25:30 +0000 (17:25 -0700)]
am
063d02bb: Merge "SipService: turn off verbose logging" into gingerbread
Merge commit '
063d02bb03a9260314b529490866528433148738' into gingerbread-plus-aosp
* commit '
063d02bb03a9260314b529490866528433148738':
SipService: turn off verbose logging
Steve Howard [Fri, 1 Oct 2010 00:22:35 +0000 (17:22 -0700)]
am
4ba2817c: Merge "Avoid NPE when viewing failed legacy download with no local path" into gingerbread
Merge commit '
4ba2817c869d4ec6b518a57ea32cc3765b18b0db' into gingerbread-plus-aosp
* commit '
4ba2817c869d4ec6b518a57ea32cc3765b18b0db':
Avoid NPE when viewing failed legacy download with no local path
Hung-ying Tyan [Fri, 1 Oct 2010 00:20:25 +0000 (17:20 -0700)]
Merge "SipService: turn off verbose logging" into gingerbread
Jake Hamby [Thu, 30 Sep 2010 23:29:13 +0000 (16:29 -0700)]
resolved conflicts for merge of
0a972acf to gingerbread-plus-aosp
Change-Id: Id8dc5038edc214b4433bdf690243f2f5fe5b4812
Steve Howard [Thu, 30 Sep 2010 23:22:58 +0000 (16:22 -0700)]
Merge "Avoid NPE when viewing failed legacy download with no local path" into gingerbread
Jeff Brown [Thu, 30 Sep 2010 22:57:29 +0000 (15:57 -0700)]
am
e0c12c88: Merge "Move verbose logging of device capabilities to dumpsys." into gingerbread
Merge commit '
e0c12c8803a7e2457098afc5dbf00e501d725fa0' into gingerbread-plus-aosp
* commit '
e0c12c8803a7e2457098afc5dbf00e501d725fa0':
Move verbose logging of device capabilities to dumpsys.
Eric Fischer [Thu, 30 Sep 2010 22:54:26 +0000 (15:54 -0700)]
am
194f5244: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Merge commit '
194f524456ebecbe13180146160a9b177cfb6be1' into gingerbread-plus-aosp
* commit '
194f524456ebecbe13180146160a9b177cfb6be1':
Import revised translations. DO NOT MERGE
Jake Hamby [Thu, 30 Sep 2010 22:47:34 +0000 (15:47 -0700)]
Merge "Typo fixes in comments and minor code cleanups." into gingerbread
Jeff Brown [Thu, 30 Sep 2010 22:46:00 +0000 (15:46 -0700)]
Merge "Move verbose logging of device capabilities to dumpsys." into gingerbread
Eric Fischer [Thu, 30 Sep 2010 22:44:54 +0000 (15:44 -0700)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Jeff Brown [Thu, 30 Sep 2010 21:33:04 +0000 (14:33 -0700)]
Move verbose logging of device capabilities to dumpsys.
Change-Id: I5d55eaebfdf049bd1ac1e7bab2758886cfefc9d7
Kenny Root [Thu, 30 Sep 2010 21:30:14 +0000 (14:30 -0700)]
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
Kenny Root [Thu, 30 Sep 2010 21:27:15 +0000 (14:27 -0700)]
Merge "Fix location of gdbserver upon installation" into gingerbread
Mike Lockwood [Thu, 30 Sep 2010 20:10:50 +0000 (13:10 -0700)]
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
Mike Lockwood [Thu, 30 Sep 2010 20:07:06 +0000 (13:07 -0700)]
Merge "location: rebind to network location and geocoder services after package update" into gingerbread
Dianne Hackborn [Thu, 30 Sep 2010 19:43:55 +0000 (12:43 -0700)]
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.
Dianne Hackborn [Thu, 30 Sep 2010 19:40:52 +0000 (12:40 -0700)]
Merge "Fix night/notnight resource folder handling." into gingerbread
Paul Westbrook [Thu, 30 Sep 2010 18:45:05 +0000 (11:45 -0700)]
am
fcf1948a: Moved Rfc822 validator test
Merge commit '
fcf1948aeb0b548d1f89890d58baefd008880cb7' into gingerbread-plus-aosp
* commit '
fcf1948aeb0b548d1f89890d58baefd008880cb7':
Moved Rfc822 validator test
Steve Howard [Thu, 30 Sep 2010 18:42:16 +0000 (11:42 -0700)]
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
Steve Howard [Thu, 30 Sep 2010 18:11:16 +0000 (11:11 -0700)]
Merge "Have download manager give more details when downloads are paused" into gingerbread
Wu-cheng Li [Thu, 30 Sep 2010 18:07:23 +0000 (11:07 -0700)]
am
2fb818ca: Fix the javadoc of Parameters.setRotation.
Merge commit '
2fb818ca7dd53d00646854a2473f1a69be43067c' into gingerbread-plus-aosp
* commit '
2fb818ca7dd53d00646854a2473f1a69be43067c':
Fix the javadoc of Parameters.setRotation.
Chia-chi Yeh [Thu, 30 Sep 2010 17:27:34 +0000 (01:27 +0800)]
KeyStore: Update the parameters of generating master keys.
To improve the security, the parameters to generate the master key has
been changed. Special cares has been taken to prevent from permanent
damages of the existing data during the transition process.
Change-Id: I0c93f3de28a9fcd314932675ccfb65a7f11fa3ff
Chia-chi Yeh [Thu, 30 Sep 2010 17:11:16 +0000 (10:11 -0700)]
am
20cb2310: Merge "KeyStore: Initialize IV correctly." into gingerbread
Merge commit '
20cb2310cffb787c54016d50b9b5fe320fc5b025' into gingerbread-plus-aosp
* commit '
20cb2310cffb787c54016d50b9b5fe320fc5b025':
KeyStore: Initialize IV correctly.
Chia-chi Yeh [Thu, 30 Sep 2010 17:11:07 +0000 (10:11 -0700)]
am
21ae1ad6: RTP: Minor fixes with polishing.
Merge commit '
21ae1ad6a695d6f1f253797fcf2a77b975b82cd3' into gingerbread-plus-aosp
* commit '
21ae1ad6a695d6f1f253797fcf2a77b975b82cd3':
RTP: Minor fixes with polishing.
Chia-chi Yeh [Thu, 30 Sep 2010 17:10:59 +0000 (10:10 -0700)]
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.
Hung-ying Tyan [Thu, 30 Sep 2010 17:10:52 +0000 (10:10 -0700)]
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
Chia-chi Yeh [Thu, 30 Sep 2010 17:10:46 +0000 (10:10 -0700)]
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.
Hung-ying Tyan [Thu, 30 Sep 2010 17:10:41 +0000 (10:10 -0700)]
am
6a53489a: SipService: add UID check.
Merge commit '
6a53489ae594d7cc373a00687d6ea2f23d0634df' into gingerbread-plus-aosp
* commit '
6a53489ae594d7cc373a00687d6ea2f23d0634df':
SipService: add UID check.
Adam Powell [Thu, 30 Sep 2010 17:10:34 +0000 (10:10 -0700)]
am
bc87ada1: Merge "Fix text anchors" into gingerbread
Merge commit '
bc87ada10de34c2d7b1301af86d94ed7c4801120' into gingerbread-plus-aosp
* commit '
bc87ada10de34c2d7b1301af86d94ed7c4801120':
Fix text anchors
Jeff Brown [Thu, 30 Sep 2010 17:10:20 +0000 (10:10 -0700)]
am
5068ad8d: Revert orientation change.
Merge commit '
5068ad8d2396d6d7bfbdb1c2c3fe57104744f1f9' into gingerbread-plus-aosp
* commit '
5068ad8d2396d6d7bfbdb1c2c3fe57104744f1f9':
Revert orientation change.
Robert Greenwalt [Thu, 30 Sep 2010 17:10:14 +0000 (10:10 -0700)]
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
Jeff Brown [Thu, 30 Sep 2010 17:10:09 +0000 (10:10 -0700)]
am
93e3296f: Merge "PointerLocationView: Display orientation correctly." into gingerbread
Merge commit '
93e3296f946bf54e0f8172c9d26355d9a65c878f' into gingerbread-plus-aosp
* commit '
93e3296f946bf54e0f8172c9d26355d9a65c878f':
PointerLocationView: Display orientation correctly.
Chia-chi Yeh [Thu, 30 Sep 2010 17:10:02 +0000 (10:10 -0700)]
am
0a537b78: Merge "RTP: Enable AMR codec." into gingerbread
Merge commit '
0a537b78d3fb4db86411d745b2696459d6b98ef6' into gingerbread-plus-aosp
* commit '
0a537b78d3fb4db86411d745b2696459d6b98ef6':
RTP: Enable AMR codec.
Hung-ying Tyan [Thu, 30 Sep 2010 17:09:53 +0000 (10:09 -0700)]
am
2365b78e: Merge "SIP: misc fixes." into gingerbread
Merge commit '
2365b78e64feaa9527efb15bf4ac207a837f2b45' into gingerbread-plus-aosp
* commit '
2365b78e64feaa9527efb15bf4ac207a837f2b45':
SIP: misc fixes.
Hung-ying Tyan [Thu, 30 Sep 2010 17:09:39 +0000 (10:09 -0700)]
am
0e412304: Catch exceptions in SipPhone.canTake().
Merge commit '
0e412304813ccd3a3fb6a643836e4f0922d1dc44' into gingerbread-plus-aosp
* commit '
0e412304813ccd3a3fb6a643836e4f0922d1dc44':
Catch exceptions in SipPhone.canTake().
Hung-ying Tyan [Thu, 30 Sep 2010 17:09:33 +0000 (10:09 -0700)]
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.
Gilles Debunne [Thu, 30 Sep 2010 17:08:38 +0000 (10:08 -0700)]
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
Ying Wang [Thu, 30 Sep 2010 16:33:19 +0000 (09:33 -0700)]
am
3caaa64e: Merge "Fix proguard flag file dependency." into gingerbread
Merge commit '
3caaa64e866fa3aba1d5ba3070a3b092bb835a93' into gingerbread-plus-aosp
* commit '
3caaa64e866fa3aba1d5ba3070a3b092bb835a93':
Fix proguard flag file dependency.
Chia-chi Yeh [Thu, 30 Sep 2010 09:44:16 +0000 (02:44 -0700)]
Merge "KeyStore: Initialize IV correctly." into gingerbread
Chia-chi Yeh [Thu, 30 Sep 2010 09:28:01 +0000 (17:28 +0800)]
KeyStore: Initialize IV correctly.
Change-Id: Idbf207dfcc11b92e606cbf4fd3732ed7a8aa3416
Chia-chi Yeh [Thu, 30 Sep 2010 07:39:32 +0000 (00:39 -0700)]
Merge "KeyStore: Fix the return value when send() or recv() has an error." into gingerbread
Chia-chi Yeh [Thu, 30 Sep 2010 07:17:58 +0000 (15:17 +0800)]
KeyStore: Fix the return value when send() or recv() has an error.
Change-Id: I20a63c76bd29b1a9f8959a6c4fe5a5b8a9a971b4
Hung-ying Tyan [Thu, 30 Sep 2010 07:05:58 +0000 (00:05 -0700)]
Merge "Add uri field to SipManager.ListenerRelay" into gingerbread
Chia-chi Yeh [Thu, 30 Sep 2010 06:24:32 +0000 (23:24 -0700)]
Merge "RTP: Adjust the jitter buffer to 512ms." into gingerbread
Adam Powell [Thu, 30 Sep 2010 04:05:12 +0000 (21:05 -0700)]
Merge "Fix text anchors" into gingerbread
Robert Greenwalt [Thu, 30 Sep 2010 02:48:57 +0000 (19:48 -0700)]
Merge "Change the 0_fully signal icon to the new style" into gingerbread
Jeff Brown [Thu, 30 Sep 2010 02:08:02 +0000 (19:08 -0700)]
Merge "PointerLocationView: Display orientation correctly." into gingerbread
Chia-chi Yeh [Thu, 30 Sep 2010 01:32:24 +0000 (18:32 -0700)]
Merge "RTP: Enable AMR codec." into gingerbread
Hung-ying Tyan [Thu, 30 Sep 2010 01:12:12 +0000 (18:12 -0700)]
Merge "SIP: misc fixes." into gingerbread
Gilles Debunne [Thu, 30 Sep 2010 00:05:26 +0000 (17:05 -0700)]
Merge "New assets for status bar data_edge and overscroll" into gingerbread
Ying Wang [Wed, 29 Sep 2010 23:13:21 +0000 (16:13 -0700)]
Merge "Fix proguard flag file dependency." into gingerbread
Joe Onorato [Wed, 29 Sep 2010 21:28:03 +0000 (14:28 -0700)]
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.
Joe Onorato [Wed, 29 Sep 2010 21:25:15 +0000 (14:25 -0700)]
Merge "AnimatedImageView: Stop the animation when we're not visible." into gingerbread
David Brown [Wed, 29 Sep 2010 21:10:37 +0000 (14:10 -0700)]
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.
David Brown [Wed, 29 Sep 2010 21:08:31 +0000 (14:08 -0700)]
Merge "Implement contacts lookup (caller-id) for incoming SIP calls." into gingerbread
Doug Zongker [Wed, 29 Sep 2010 20:43:28 +0000 (13:43 -0700)]
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
Doug Zongker [Wed, 29 Sep 2010 20:41:00 +0000 (13:41 -0700)]
Merge "don't delete /cache/recovery/last_log on boot" into gingerbread