git.osdn.net Git - android-x86/frameworks-native.git/log

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

Dianne Hackborn [Fri, 1 Oct 2010 02:03:38 +0000 (19:03 -0700)]

Merge "Rub in a little 'ol log-b-gone." into gingerbread

commit | commitdiff | tree

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.

commit | commitdiff | tree

Joe Onorato [Fri, 1 Oct 2010 01:12:24 +0000 (18:12 -0700)]

Merge "Use the private version of userActivity." into gingerbread

commit | commitdiff | tree

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

commit | commitdiff | tree

Kenny Root [Fri, 1 Oct 2010 01:03:25 +0000 (18:03 -0700)]

Merge "Being already unmounted is not a failure" into gingerbread

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Eric Laurent [Fri, 1 Oct 2010 00:39:36 +0000 (17:39 -0700)]

Merge "Issue 3032913: improve AudioTrack recovery time" into gingerbread

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Hung-ying Tyan [Fri, 1 Oct 2010 00:20:25 +0000 (17:20 -0700)]

Merge "SipService: turn off verbose logging" into gingerbread

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

Jake Hamby [Thu, 30 Sep 2010 22:47:34 +0000 (15:47 -0700)]

Merge "Typo fixes in comments and minor code cleanups." into gingerbread

commit | commitdiff | tree

Jeff Brown [Thu, 30 Sep 2010 22:46:00 +0000 (15:46 -0700)]

Merge "Move verbose logging of device capabilities to dumpsys." into gingerbread

commit | commitdiff | tree

Eric Fischer [Thu, 30 Sep 2010 22:44:54 +0000 (15:44 -0700)]

Merge "Import revised translations. DO NOT MERGE" into gingerbread

commit | commitdiff | tree

Jeff Brown [Thu, 30 Sep 2010 21:33:04 +0000 (14:33 -0700)]

Move verbose logging of device capabilities to dumpsys.

Change-Id: I5d55eaebfdf049bd1ac1e7bab2758886cfefc9d7

commit | commitdiff | tree

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

commit | commitdiff | tree

Kenny Root [Thu, 30 Sep 2010 21:27:15 +0000 (14:27 -0700)]

Merge "Fix location of gdbserver upon installation" into gingerbread

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

Dianne Hackborn [Thu, 30 Sep 2010 19:40:52 +0000 (12:40 -0700)]

Merge "Fix night/notnight resource folder handling." into gingerbread

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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().

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

Chia-chi Yeh [Thu, 30 Sep 2010 09:44:16 +0000 (02:44 -0700)]

Merge "KeyStore: Initialize IV correctly." into gingerbread

commit | commitdiff | tree

Chia-chi Yeh [Thu, 30 Sep 2010 09:28:01 +0000 (17:28 +0800)]

KeyStore: Initialize IV correctly.

Change-Id: Idbf207dfcc11b92e606cbf4fd3732ed7a8aa3416

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Hung-ying Tyan [Thu, 30 Sep 2010 07:05:58 +0000 (00:05 -0700)]

Merge "Add uri field to SipManager.ListenerRelay" into gingerbread

commit | commitdiff | tree

Chia-chi Yeh [Thu, 30 Sep 2010 06:24:32 +0000 (23:24 -0700)]

Merge "RTP: Adjust the jitter buffer to 512ms." into gingerbread

commit | commitdiff | tree

Adam Powell [Thu, 30 Sep 2010 04:05:12 +0000 (21:05 -0700)]

Merge "Fix text anchors" into gingerbread

commit | commitdiff | tree

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

commit | commitdiff | tree

Jeff Brown [Thu, 30 Sep 2010 02:08:02 +0000 (19:08 -0700)]

Merge "PointerLocationView: Display orientation correctly." into gingerbread

commit | commitdiff | tree

Chia-chi Yeh [Thu, 30 Sep 2010 01:32:24 +0000 (18:32 -0700)]

Merge "RTP: Enable AMR codec." into gingerbread

commit | commitdiff | tree

Hung-ying Tyan [Thu, 30 Sep 2010 01:12:12 +0000 (18:12 -0700)]

Merge "SIP: misc fixes." into gingerbread

commit | commitdiff | tree

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

commit | commitdiff | tree

Ying Wang [Wed, 29 Sep 2010 23:13:21 +0000 (16:13 -0700)]

Merge "Fix proguard flag file dependency." into gingerbread

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Jaikumar Ganesh [Wed, 29 Sep 2010 20:27:38 +0000 (13:27 -0700)]

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.

commit | commitdiff | tree

Jaikumar Ganesh [Wed, 29 Sep 2010 20:24:53 +0000 (13:24 -0700)]

Merge "Update local cache before sending intent." into gingerbread

commit | commitdiff | tree

Gilles Debunne [Wed, 29 Sep 2010 19:20:31 +0000 (12:20 -0700)]

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.

commit | commitdiff | tree

Eric Fischer [Wed, 29 Sep 2010 19:17:28 +0000 (12:17 -0700)]

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.

commit | commitdiff | tree

Chia-chi Yeh [Wed, 29 Sep 2010 19:17:24 +0000 (12:17 -0700)]

am 955ab37c: Merge "RTP: Enable GSM-EFR codec." into gingerbread

Merge commit '955ab37cee3b2c61e67a2f8ceca895b47f6a182c' into gingerbread-plus-aosp

* commit '955ab37cee3b2c61e67a2f8ceca895b47f6a182c':
RTP: Enable GSM-EFR codec.

commit | commitdiff | tree

Gilles Debunne [Wed, 29 Sep 2010 19:15:51 +0000 (12:15 -0700)]

Merge "New assets: wifi signal 1, no sim card." into gingerbread

commit | commitdiff | tree

Eric Fischer [Wed, 29 Sep 2010 19:14:10 +0000 (12:14 -0700)]

Merge "Split strings with SD card references into variations." into gingerbread

commit | commitdiff | tree

Chia-chi Yeh [Wed, 29 Sep 2010 19:12:51 +0000 (12:12 -0700)]

Merge "RTP: Enable GSM-EFR codec." into gingerbread

commit | commitdiff | tree

Chia-chi Yeh [Wed, 29 Sep 2010 18:53:07 +0000 (11:53 -0700)]

am cd386649: Merge "RTP: Revise the workaround of private addresses and fix bugs." into gingerbread

Merge commit 'cd38664916ca9e8c85c3269fec61e6a447ec7004' into gingerbread-plus-aosp

* commit 'cd38664916ca9e8c85c3269fec61e6a447ec7004':
RTP: Revise the workaround of private addresses and fix bugs.

commit | commitdiff | tree

Chia-chi Yeh [Wed, 29 Sep 2010 18:50:16 +0000 (11:50 -0700)]

Merge "RTP: Revise the workaround of private addresses and fix bugs." into gingerbread

commit | commitdiff | tree

Joe Onorato [Wed, 29 Sep 2010 18:02:55 +0000 (11:02 -0700)]

am f01a8730: Merge "Revert "Revert "Check for the DEVICE_POWER permission in userActivity.""" into gingerbread

Merge commit 'f01a873029641da2155ca1882f311d8f4e92675a' into gingerbread-plus-aosp

* commit 'f01a873029641da2155ca1882f311d8f4e92675a':
Revert "Revert "Check for the DEVICE_POWER permission in userActivity.""

commit | commitdiff | tree

Joe Onorato [Wed, 29 Sep 2010 18:00:14 +0000 (11:00 -0700)]

Merge "Revert "Revert "Check for the DEVICE_POWER permission in userActivity.""" into gingerbread

commit | commitdiff | tree

Roy West [Wed, 29 Sep 2010 17:40:06 +0000 (10:40 -0700)]

am d146c233: Merge "Partial fix to bug 2992589: Edit dev admin strings." into gingerbread

Merge commit 'd146c233c570af3ee31d2e6ac44082571026d619' into gingerbread-plus-aosp

* commit 'd146c233c570af3ee31d2e6ac44082571026d619':
Partial fix to bug 2992589: Edit dev admin strings.

commit | commitdiff | tree

Roy West [Wed, 29 Sep 2010 17:37:11 +0000 (10:37 -0700)]

Merge "Partial fix to bug 2992589: Edit dev admin strings." into gingerbread

commit | commitdiff | tree

Kenny Root [Wed, 29 Sep 2010 14:53:06 +0000 (07:53 -0700)]

am 212d81a0: Merge "Move all the permissions check up for unmount" into gingerbread

Merge commit '212d81a004f50e51ed8f6d803b79f4b71546b351' into gingerbread-plus-aosp

* commit '212d81a004f50e51ed8f6d803b79f4b71546b351':
Move all the permissions check up for unmount

commit | commitdiff | tree

Kenny Root [Wed, 29 Sep 2010 14:40:32 +0000 (07:40 -0700)]

Merge "Move all the permissions check up for unmount" into gingerbread

commit | commitdiff | tree

Nick Pelly [Wed, 29 Sep 2010 05:40:18 +0000 (22:40 -0700)]

am 038cabe0: NFC integration

Merge commit '038cabe0247ee46df62f9363f1a303bc5b9c1028' into gingerbread-plus-aosp

* commit '038cabe0247ee46df62f9363f1a303bc5b9c1028':
NFC integration

commit | commitdiff | tree

Chia-chi Yeh [Wed, 29 Sep 2010 04:13:54 +0000 (21:13 -0700)]

am d6877fa4: Merge "AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h instead." into gingerbread

Merge commit 'd6877fa4971710150de20453bf4ba54dca863429' into gingerbread-plus-aosp

* commit 'd6877fa4971710150de20453bf4ba54dca863429':
AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h instead.

commit | commitdiff | tree

Chia-chi Yeh [Wed, 29 Sep 2010 04:11:27 +0000 (21:11 -0700)]

Merge "AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h instead." into gingerbread

commit | commitdiff | tree

Mike Lockwood [Wed, 29 Sep 2010 03:18:36 +0000 (20:18 -0700)]

am a25eabad: Merge "Revert "Check for the DEVICE_POWER permission in userActivity."" into gingerbread

Merge commit 'a25eabad23d7b8fd430ada757ae4e9f2559f8845' into gingerbread-plus-aosp

* commit 'a25eabad23d7b8fd430ada757ae4e9f2559f8845':
Revert "Check for the DEVICE_POWER permission in userActivity."

commit | commitdiff | tree

Mike Lockwood [Wed, 29 Sep 2010 03:15:55 +0000 (20:15 -0700)]

Merge "Revert "Check for the DEVICE_POWER permission in userActivity."" into gingerbread

commit | commitdiff | tree

Chia-chi Yeh [Wed, 29 Sep 2010 02:43:50 +0000 (19:43 -0700)]

am e006e4d2: Merge changes Iae1913fb,I38dbefef into gingerbread

Merge commit 'e006e4d2c91c50795df0a02366b31610b4e97cb1' into gingerbread-plus-aosp

* commit 'e006e4d2c91c50795df0a02366b31610b4e97cb1':
RTP: Enable GSM codec.
RTP: Refactor out G711 codecs into another file.

commit | commitdiff | tree

Chia-chi Yeh [Wed, 29 Sep 2010 02:40:59 +0000 (19:40 -0700)]

Merge changes Iae1913fb,I38dbefef into gingerbread

* changes:
RTP: Enable GSM codec.
RTP: Refactor out G711 codecs into another file.

commit | commitdiff | tree

Dianne Hackborn [Wed, 29 Sep 2010 01:20:26 +0000 (18:20 -0700)]

am 3e94b94f: Merge "Remove old location classes." into gingerbread

Merge commit '3e94b94f56888acbd1f8deb23c05474baaf4fae3' into gingerbread-plus-aosp

* commit '3e94b94f56888acbd1f8deb23c05474baaf4fae3':
Remove old location classes.

commit | commitdiff | tree

Dianne Hackborn [Wed, 29 Sep 2010 01:16:58 +0000 (18:16 -0700)]

Merge "Remove old location classes." into gingerbread

commit | commitdiff | tree

Kenny Root [Wed, 29 Sep 2010 00:33:47 +0000 (17:33 -0700)]

am 05105f7a: Update OBB API to include callbacks

Merge commit '05105f7abe02b2dff91d6260b3628c8b97816bab' into gingerbread-plus-aosp

* commit '05105f7abe02b2dff91d6260b3628c8b97816bab':
Update OBB API to include callbacks

commit | commitdiff | tree

Joe Onorato [Wed, 29 Sep 2010 00:22:09 +0000 (17:22 -0700)]

am ea2cf2f9: Merge "Check for the DEVICE_POWER permission in userActivity." into gingerbread

Merge commit 'ea2cf2f936b03f1720bc43863e41c89ea2a7903a' into gingerbread-plus-aosp

* commit 'ea2cf2f936b03f1720bc43863e41c89ea2a7903a':
Check for the DEVICE_POWER permission in userActivity.

commit | commitdiff | tree

Joe Onorato [Wed, 29 Sep 2010 00:22:02 +0000 (17:22 -0700)]

am f2f34505: Merge "Fix 3041579 overscroll effect in notification area looks strange" into gingerbread

Merge commit 'f2f34505a1267955b5533ee04f803b1bcd83140a' into gingerbread-plus-aosp

* commit 'f2f34505a1267955b5533ee04f803b1bcd83140a':
Fix 3041579 overscroll effect in notification area looks strange

commit | commitdiff | tree

Joe Onorato [Wed, 29 Sep 2010 00:19:37 +0000 (17:19 -0700)]

Merge "Check for the DEVICE_POWER permission in userActivity." into gingerbread

commit | commitdiff | tree

Joe Onorato [Wed, 29 Sep 2010 00:18:59 +0000 (17:18 -0700)]

Merge "Fix 3041579 overscroll effect in notification area looks strange" into gingerbread