OSDN Git Service
Conley Owens [Fri, 29 Apr 2011 17:24:16 +0000 (10:24 -0700)]
am
58e4a5e2: Merge "Fixed to draw texture when loadTexture() is called at first time"
* commit '
58e4a5e2094c5003225fc715ee1a53b2461e71b1':
Fixed to draw texture when loadTexture() is called at first time
Conley Owens [Fri, 29 Apr 2011 17:24:12 +0000 (10:24 -0700)]
am
9355a24a: Merge "Fixing wrong Japanese phone formatter."
* commit '
9355a24af2a4985902f1e9ab4233df3fb831ef72':
Fixing wrong Japanese phone formatter.
Conley Owens [Fri, 29 Apr 2011 17:24:08 +0000 (10:24 -0700)]
am
9fd8e057: Merge "Fix memory leak of SkMovie class"
* commit '
9fd8e0579fb3306f61ba1716b1977562ae3626e1':
Fix memory leak of SkMovie class
Conley Owens [Fri, 29 Apr 2011 17:24:03 +0000 (10:24 -0700)]
am
8ebf3558: Merge "Implement support for ALT and SHIFT modifiers"
* commit '
8ebf35589dd2bee84ad93613df21666b8858a10f':
Implement support for ALT and SHIFT modifiers
Conley Owens [Fri, 29 Apr 2011 17:23:58 +0000 (10:23 -0700)]
am
b1578d85: Merge "Fix startSearch condition on Dialog, because pressing search key causes ANR popup. If search key is pressed on Dialog and there is no search item then do nothing. How to reproduce the issue: Settings > About phone > Legal information > Google legal
* commit '
b1578d85ce1b3f3c5e2cf0271011c016b93b7e1a':
Fix startSearch condition on Dialog, because pressing search key causes ANR popup. If search key is pressed on Dialog and there is no search item then do nothing. How to reproduce the issue: Settings > About phone > Legal information > Google legal > Press search key > Touch list item or press back key > ANR popup is shown
Conley Owens [Fri, 29 Apr 2011 17:23:53 +0000 (10:23 -0700)]
am
1ecd0a9b: Merge "modify the device to enable to get the state as slide-open/slide-close."
* commit '
1ecd0a9b28f8d608cac1a1db6c9bd493ace0ca3e':
modify the device to enable to get the state as slide-open/slide-close.
Conley Owens [Fri, 29 Apr 2011 17:23:47 +0000 (10:23 -0700)]
am
69ef0d55: Merge "Adding missing breaks in BnSurfaceComposer::onTransact"
* commit '
69ef0d55d7d7cb9b9bcccffff50ea10ac3833aaa':
Adding missing breaks in BnSurfaceComposer::onTransact
Conley Owens [Fri, 29 Apr 2011 17:23:42 +0000 (10:23 -0700)]
am
7ae9f08a: Merge "Fixed to call computeVisibleRegions() when transparent value changed"
* commit '
7ae9f08a179fa3b312b80826cfc3c6dc97b792ec':
Fixed to call computeVisibleRegions() when transparent value changed
Conley Owens [Fri, 29 Apr 2011 17:23:35 +0000 (10:23 -0700)]
am
03daee63: Merge "frameworks/base: acquire lock on am only when needed"
* commit '
03daee6380772b0ab167a7b28e37d7a21ec89c86':
frameworks/base: acquire lock on am only when needed
Conley Owens [Fri, 29 Apr 2011 17:23:28 +0000 (10:23 -0700)]
am
2f463ef1: Merge "Adding a sanity test in the while loop in readHistory()"
* commit '
2f463ef18bb235be57b39cbda536bcd2df2d0908':
Adding a sanity test in the while loop in readHistory()
Conley Owens [Fri, 29 Apr 2011 17:20:34 +0000 (10:20 -0700)]
am
c5505f6a: Merge "Improved conversion accuracy of exif geotag data"
* commit '
c5505f6a150db8232cc275bedd400f7f5a593530':
Improved conversion accuracy of exif geotag data
Conley Owens [Fri, 29 Apr 2011 17:20:25 +0000 (10:20 -0700)]
am
e1b3f15c: Merge "Fixes broken image link in "Tools -> Traceview" documentation page."
* commit '
e1b3f15cadc630469cfadea63275ba8d9a1c9052':
Fixes broken image link in "Tools -> Traceview" documentation page.
Conley Owens [Fri, 29 Apr 2011 17:01:23 +0000 (10:01 -0700)]
Merge "Adjust mBiggerTouchSlopSquare to the suitable value"
Conley Owens [Fri, 29 Apr 2011 17:00:26 +0000 (10:00 -0700)]
Merge "Scolling using arrow keys with padding"
Conley Owens [Fri, 29 Apr 2011 17:00:20 +0000 (10:00 -0700)]
Merge "CHAR_SEQUENCE_CREATOR cannot handle null string"
Conley Owens [Fri, 29 Apr 2011 17:00:12 +0000 (10:00 -0700)]
Merge "Fixed to draw texture when loadTexture() is called at first time"
Conley Owens [Fri, 29 Apr 2011 17:00:06 +0000 (10:00 -0700)]
Merge "Fixing wrong Japanese phone formatter."
Conley Owens [Fri, 29 Apr 2011 17:00:00 +0000 (10:00 -0700)]
Merge "Fix memory leak of SkMovie class"
Conley Owens [Fri, 29 Apr 2011 16:59:55 +0000 (09:59 -0700)]
Merge "Implement support for ALT and SHIFT modifiers"
Conley Owens [Fri, 29 Apr 2011 16:59:48 +0000 (09:59 -0700)]
Merge "Fix startSearch condition on Dialog, because pressing search key causes ANR popup. If search key is pressed on Dialog and there is no search item then do nothing. How to reproduce the issue: Settings > About phone > Legal information > Google legal > Press search key > Touch list item or press back key > ANR popup is shown"
Conley Owens [Fri, 29 Apr 2011 16:59:42 +0000 (09:59 -0700)]
Merge "modify the device to enable to get the state as slide-open/slide-close."
Conley Owens [Fri, 29 Apr 2011 16:59:36 +0000 (09:59 -0700)]
Merge "Adding missing breaks in BnSurfaceComposer::onTransact"
Conley Owens [Fri, 29 Apr 2011 16:59:30 +0000 (09:59 -0700)]
Merge "Fixed to call computeVisibleRegions() when transparent value changed"
Conley Owens [Fri, 29 Apr 2011 16:59:22 +0000 (09:59 -0700)]
Merge "frameworks/base: acquire lock on am only when needed"
Conley Owens [Fri, 29 Apr 2011 16:56:58 +0000 (09:56 -0700)]
Merge "Adding a sanity test in the while loop in readHistory()"
Conley Owens [Fri, 29 Apr 2011 16:48:10 +0000 (09:48 -0700)]
Merge "Improved conversion accuracy of exif geotag data"
Conley Owens [Fri, 29 Apr 2011 16:48:04 +0000 (09:48 -0700)]
Merge "Fixes broken image link in "Tools -> Traceview" documentation page."
Conley Owens [Fri, 29 Apr 2011 06:52:45 +0000 (23:52 -0700)]
am
e1787009: Merge "Added null check on return value for getKeyDispatcherState()"
* commit '
e17870092941cecf64956819d395ec34111cbe71':
Added null check on return value for getKeyDispatcherState()
Conley Owens [Fri, 29 Apr 2011 06:52:41 +0000 (23:52 -0700)]
am
501f7bca: Merge "Eliminating dead logic - bitmap state simply cannot be null here."
* commit '
501f7bca83ecc2200a590966e461590d9716df7d':
Eliminating dead logic - bitmap state simply cannot be null here.
Conley Owens [Fri, 29 Apr 2011 06:52:37 +0000 (23:52 -0700)]
am
11d7ec24: Merge "Removing unnecessary computation."
* commit '
11d7ec24a55319b68bcc96443372c263a41b7dc5':
Removing unnecessary computation.
Conley Owens [Fri, 29 Apr 2011 06:52:32 +0000 (23:52 -0700)]
am
e41d2aed: Merge "Using robust equality check."
* commit '
e41d2aed9c8d990d31af70642ae688dad1d8fb4b':
Using robust equality check.
Conley Owens [Fri, 29 Apr 2011 06:52:26 +0000 (23:52 -0700)]
am
1e29552b: Merge "We don\'t need these local references."
* commit '
1e29552bd5feeb24952a0486e3263396978212df':
We don't need these local references.
Conley Owens [Fri, 29 Apr 2011 06:52:21 +0000 (23:52 -0700)]
am
da882181: Merge "Eliminating dead code with no other effect than consuming battery life."
* commit '
da882181245fdf3eca827680d656cd298c9c318f':
Eliminating dead code with no other effect than consuming battery life.
Conley Owens [Thu, 28 Apr 2011 22:07:00 +0000 (15:07 -0700)]
Merge "Added null check on return value for getKeyDispatcherState()"
Conley Owens [Thu, 28 Apr 2011 21:57:14 +0000 (14:57 -0700)]
Merge "Eliminating dead logic - bitmap state simply cannot be null here."
Conley Owens [Thu, 28 Apr 2011 21:57:11 +0000 (14:57 -0700)]
Merge "Removing unnecessary computation."
Conley Owens [Thu, 28 Apr 2011 21:57:08 +0000 (14:57 -0700)]
Merge "Using robust equality check."
Conley Owens [Thu, 28 Apr 2011 21:56:59 +0000 (14:56 -0700)]
Merge "We don't need these local references."
Conley Owens [Thu, 28 Apr 2011 21:56:55 +0000 (14:56 -0700)]
Merge "Eliminating dead code with no other effect than consuming battery life."
Conley Owens [Thu, 28 Apr 2011 19:00:53 +0000 (12:00 -0700)]
am
e6e3322a: am
8fff7805: Merge "Remove duplicate \'=\' in exception message"
* commit '
e6e3322a3baef4cce7d382a7890718a805c4bd3b':
Remove duplicate '=' in exception message
Conley Owens [Thu, 28 Apr 2011 18:57:48 +0000 (11:57 -0700)]
am
8fff7805: Merge "Remove duplicate \'=\' in exception message"
* commit '
8fff7805ab1ccde8321697116ed3dd2fae5340ed':
Remove duplicate '=' in exception message
Conley Owens [Thu, 28 Apr 2011 18:46:39 +0000 (11:46 -0700)]
Merge "Remove duplicate '=' in exception message"
Eric Fischer [Wed, 27 Apr 2011 22:30:36 +0000 (15:30 -0700)]
am
a4e7353d: Import revised translations. DO NOT MERGE
* commit '
a4e7353d33a0736361c866db76008a66ad8fbf8a':
Import revised translations. DO NOT MERGE
Conley Owens [Wed, 27 Apr 2011 21:53:26 +0000 (14:53 -0700)]
am
a6590e7f: am
13b21e60: Merge "Auto hide virtual keyboard"
* commit '
a6590e7fee1ef4286f0896358593fdb9aab24f6c':
Auto hide virtual keyboard
Conley Owens [Wed, 27 Apr 2011 21:53:15 +0000 (14:53 -0700)]
am
cfe7b9fc: am
a538b4a2: Merge "onDetachedFromWindow is called before onAttachedToWindow"
* commit '
cfe7b9fcfaeda1e79a8673e4005bcb307f9e9313':
onDetachedFromWindow is called before onAttachedToWindow
Conley Owens [Wed, 27 Apr 2011 21:53:10 +0000 (14:53 -0700)]
am
779fa151: am
4a4d96e7: Merge changes I0ab47e2f,Ib8016996
* commit '
779fa1515d0b6cf17a449dc79f83a7c4e70ff0fe':
Remove errant tag terminator
Normalize output of XMLtree content
Conley Owens [Wed, 27 Apr 2011 20:53:46 +0000 (13:53 -0700)]
am
13b21e60: Merge "Auto hide virtual keyboard"
* commit '
13b21e608e47382cb94a0aeac13b24ac97f355d2':
Auto hide virtual keyboard
Conley Owens [Wed, 27 Apr 2011 20:53:37 +0000 (13:53 -0700)]
am
a538b4a2: Merge "onDetachedFromWindow is called before onAttachedToWindow"
* commit '
a538b4a206c54ef763dab4da00990a8991425e77':
onDetachedFromWindow is called before onAttachedToWindow
Conley Owens [Wed, 27 Apr 2011 20:48:45 +0000 (13:48 -0700)]
am
4a4d96e7: Merge changes I0ab47e2f,Ib8016996
* commit '
4a4d96e7ee682167861434cba05531f04642bf97':
Remove errant tag terminator
Normalize output of XMLtree content
Conley Owens [Wed, 27 Apr 2011 20:20:16 +0000 (13:20 -0700)]
Merge "Auto hide virtual keyboard"
Conley Owens [Wed, 27 Apr 2011 20:14:57 +0000 (13:14 -0700)]
Merge "onDetachedFromWindow is called before onAttachedToWindow"
Conley Owens [Wed, 27 Apr 2011 20:06:46 +0000 (13:06 -0700)]
Merge changes I0ab47e2f,Ib8016996
* changes:
Remove errant tag terminator
Normalize output of XMLtree content
Conley Owens [Wed, 27 Apr 2011 19:46:09 +0000 (12:46 -0700)]
am
f0556bb9: am
86d1d747: Merge "Add lock before calling initEglImage"
* commit '
f0556bb90ff38be96c6099f5efafe386cd7f1083':
Add lock before calling initEglImage
Conley Owens [Wed, 27 Apr 2011 19:43:19 +0000 (12:43 -0700)]
am
86d1d747: Merge "Add lock before calling initEglImage"
* commit '
86d1d74762e65b6f64c2d4758aa5fd4af6275696':
Add lock before calling initEglImage
Conley Owens [Wed, 27 Apr 2011 19:28:05 +0000 (12:28 -0700)]
Merge "Add lock before calling initEglImage"
Conley Owens [Wed, 27 Apr 2011 19:18:03 +0000 (12:18 -0700)]
am
30d59fa9: Ignore fix for startup NPE as file is deleted.
* commit '
30d59fa90ffa1f19674f21596175ccb5fd8febd2':
Fix for startup NPE.
Conley Owens [Wed, 27 Apr 2011 19:09:31 +0000 (12:09 -0700)]
Ignore fix for startup NPE as file is deleted.
Change-Id: Ifcedb4cc14b7079b03f585218c8c29b8f5d96d20
Conley Owens [Wed, 27 Apr 2011 18:40:46 +0000 (11:40 -0700)]
Merge "Fix for startup NPE."
Nick Pelly [Wed, 27 Apr 2011 01:04:02 +0000 (18:04 -0700)]
am
cc9ee72b: Implement dead service recovery in NFC extras library.
* commit '
cc9ee72bd42bb40b1852f907f58305adde12ecc2':
Implement dead service recovery in NFC extras library.
Conley Owens [Tue, 26 Apr 2011 22:50:33 +0000 (15:50 -0700)]
am
bf4769c7: am
17ba30b5: Merge "Load mnc/mcc configuration value from SIM (KDDI-CDMA)"
* commit '
bf4769c7da5dd39499c2c5dc4413a7f5d6ad88a5':
Load mnc/mcc configuration value from SIM (KDDI-CDMA)
Conley Owens [Tue, 26 Apr 2011 22:46:32 +0000 (15:46 -0700)]
am
17ba30b5: Merge "Load mnc/mcc configuration value from SIM (KDDI-CDMA)"
* commit '
17ba30b549a847f3aab854173a9484851f694453':
Load mnc/mcc configuration value from SIM (KDDI-CDMA)
Conley Owens [Tue, 26 Apr 2011 21:36:48 +0000 (14:36 -0700)]
Merge "Load mnc/mcc configuration value from SIM (KDDI-CDMA)"
Kenny Root [Tue, 26 Apr 2011 18:41:31 +0000 (11:41 -0700)]
am
bb10986c: am
13ce221e: Merge "libutils: Fix an improper const-cast in RefBase"
* commit '
bb10986c3d7493eaa3cd16042c8e6dae4769a071':
libutils: Fix an improper const-cast in RefBase
Kenny Root [Tue, 26 Apr 2011 18:32:22 +0000 (11:32 -0700)]
am
13ce221e: Merge "libutils: Fix an improper const-cast in RefBase"
* commit '
13ce221e4316f7956ba072e774a7b97646e5d99b':
libutils: Fix an improper const-cast in RefBase
Kenny Root [Tue, 26 Apr 2011 18:26:33 +0000 (11:26 -0700)]
Merge "libutils: Fix an improper const-cast in RefBase"
Jean-Baptiste Queru [Tue, 26 Apr 2011 08:20:37 +0000 (01:20 -0700)]
am
5fcfce96: am
4b72eec3: Merge "Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise."
* commit '
5fcfce965f1380ee7e151c1df75b247dd42b349e':
Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise.
Irfan Sheriff [Tue, 26 Apr 2011 08:01:31 +0000 (01:01 -0700)]
am
d2127c43: Handle DHCP renewal and wakeup in framework
* commit '
d2127c438fc858a4f6c8ad75b7a1e4491da69a78':
Handle DHCP renewal and wakeup in framework
Jean-Baptiste Queru [Tue, 26 Apr 2011 07:39:44 +0000 (00:39 -0700)]
am
4b72eec3: Merge "Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise."
* commit '
4b72eec34c983abb7a3afcbadd74d3bd807c4765':
Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise.
Jean-Baptiste Queru [Mon, 25 Apr 2011 20:33:37 +0000 (13:33 -0700)]
Merge "Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise."
Josh Stone [Fri, 22 Apr 2011 18:13:35 +0000 (11:13 -0700)]
libutils: Fix an improper const-cast in RefBase
Under Fedora 15 Beta, gcc 4.6.0 warns:
frameworks/base/libs/utils/RefBase.cpp: In member function
‘void android::RefBase::weakref_type::trackMe(bool, bool)’:
frameworks/base/libs/utils/RefBase.cpp:483:67: error: passing
‘const android::RefBase::weakref_impl’ as ‘this’ argument of
‘void android::RefBase::weakref_impl::trackMe(bool, bool)’
discards qualifiers [-fpermissive]
trackMe is not a const function, so don't use const in the static_cast
to a weakref_impl pointer.
Change-Id: I3c9ba73eb127985f5f54197ffecf2939c50f632c
Jaikumar Ganesh [Tue, 19 Apr 2011 22:57:24 +0000 (15:57 -0700)]
am
c34c88b9: am
ec1a8f7a: Merge "Unable to push files to Windows 7"
* commit '
c34c88b948cb60c057bd2145df9f1b2091f3c894':
Unable to push files to Windows 7
Jaikumar Ganesh [Tue, 19 Apr 2011 22:28:26 +0000 (15:28 -0700)]
am
ec1a8f7a: Merge "Unable to push files to Windows 7"
* commit '
ec1a8f7aa7e71e292ef813b1e886a9e26e3635af':
Unable to push files to Windows 7
Jaikumar Ganesh [Tue, 19 Apr 2011 21:48:08 +0000 (14:48 -0700)]
Merge "Unable to push files to Windows 7"
Andreas Huber [Mon, 18 Apr 2011 22:39:09 +0000 (15:39 -0700)]
am
f0f1ceeb: DO NOT MERGE: Make sure we restart the prefetcher immediately when trying to satisfy a read.
* commit '
f0f1ceeb517ff226532a407da6d55602f195e5b5':
DO NOT MERGE: Make sure we restart the prefetcher immediately when trying to satisfy a read.
Kobi Cohen Arazi [Fri, 15 Apr 2011 17:38:33 +0000 (10:38 -0700)]
Add lock before calling initEglImage
Without that lock, there is a chance of race condition
where while composing a specific index, requestBuf with
the same index can be executed and touch the
same data that is being used in initEglImage.
(e.g. dirty flag in texture)
Eric Fischer [Tue, 12 Apr 2011 20:02:15 +0000 (13:02 -0700)]
am
71a556f2: Import revised translations. DO NOT MERGE
* commit '
71a556f24e2b8d489bf81b22fab6fe5e99a9eae0':
Import revised translations. DO NOT MERGE
Kenny Root [Mon, 11 Apr 2011 22:33:19 +0000 (15:33 -0700)]
am
08d9d9a4: Merge "Runtime resource overlay, iteration 1."
* commit '
08d9d9a46250c4fad66e9b637e8898a3524c4286':
Runtime resource overlay, iteration 1.
Kenny Root [Mon, 11 Apr 2011 17:07:15 +0000 (10:07 -0700)]
Merge "Runtime resource overlay, iteration 1."
Brad Fitzpatrick [Thu, 7 Apr 2011 16:08:58 +0000 (09:08 -0700)]
am
ca7ad44a: Merge "audioflinger: Enable ARMv5TE optimized resampler"
* commit '
ca7ad44a8b6764b5935143bfe55700cbddb0d990':
audioflinger: Enable ARMv5TE optimized resampler
Brad Fitzpatrick [Thu, 7 Apr 2011 15:57:00 +0000 (08:57 -0700)]
Merge "audioflinger: Enable ARMv5TE optimized resampler"
Xavier Ducrohet [Thu, 7 Apr 2011 02:08:11 +0000 (19:08 -0700)]
am
59aad78e: LayoutLib: don\'t render when shader\'s local matrix is set to 0 scale.
* commit '
59aad78eae14939c169876b2f632d005f382cf7d':
LayoutLib: don't render when shader's local matrix is set to 0 scale.
Xavier Ducrohet [Thu, 7 Apr 2011 02:08:02 +0000 (19:08 -0700)]
Ichitaro Kohara [Fri, 18 Feb 2011 12:15:04 +0000 (13:15 +0100)]
Fixed to draw texture when loadTexture() is called at first time
SW renderer of Stagefright reaches loadTexture() to draw image.
The first time loadTexture() is called, it just initializes OGL
texture, then returns. Thus, the first time call doesn't draw.
This patch fixes to move on to draw stage after the initialization.
Change-Id: I3ec1ad68fb8d376a4ad7aefded1c18a002d175c4
Mike Lockwood [Mon, 4 Apr 2011 21:43:06 +0000 (14:43 -0700)]
am
43707a83: UsbManager: minor Javadoc tweak
* commit '
43707a83ec12957fb84a406276a38fbaf4e23fd3':
UsbManager: minor Javadoc tweak
Jason parks [Mon, 4 Apr 2011 21:42:54 +0000 (14:42 -0700)]
am
78a9766b: Merge "Implement teardown script." into gingerbread
* commit '
78a9766be2a08e1f6a448bdb336f2afeff71a52b':
Implement teardown script.
Jeff Hamilton [Mon, 4 Apr 2011 21:42:44 +0000 (14:42 -0700)]
am
84d34078: Make the NFC UID forward compatible.
* commit '
84d340781b1e148ead9fb4790755737c9dcc1cde':
Make the NFC UID forward compatible.
James Dong [Mon, 4 Apr 2011 21:42:05 +0000 (14:42 -0700)]
am
ea5d2c58: Merge "When read() from AudioRecord returns 0 or negative value, report an error to application. DO NOT MERGE." into gingerbread
* commit '
ea5d2c584490424be6bbc27dec58b4f9868d631e':
When read() from AudioRecord returns 0 or negative value, report an error to application. DO NOT MERGE.
Eric Laurent [Mon, 4 Apr 2011 19:25:37 +0000 (12:25 -0700)]
am
a482d83c: Merge "Issue
4157048: mic gain for VoIP/SIP calls." into gingerbread
* commit '
a482d83ccf35ccd6cc29a9e1ace3d77b5f28d013':
Issue
4157048: mic gain for VoIP/SIP calls.
Mike Lockwood [Mon, 4 Apr 2011 19:25:33 +0000 (12:25 -0700)]
am
a8731e1e: Merge "DO NOT MERGE: UsbService: Make USB disconnect handling for accessory mode more robust" into gingerbread
* commit '
a8731e1e922512e5c22485e48059f33b61ab93ea':
DO NOT MERGE: UsbService: Make USB disconnect handling for accessory mode more robust
Trevor Johns [Mon, 4 Apr 2011 19:25:29 +0000 (12:25 -0700)]
am
cafbe87d: Merge "Fixing line in Market IAB docs that explains how to bind to the MarketService." into gingerbread
* commit '
cafbe87d5b6108d71e85950796b587f95d00cfac':
Fixing line in Market IAB docs that explains how to bind to the MarketService.
Simon Wilson [Mon, 4 Apr 2011 19:25:25 +0000 (12:25 -0700)]
am
ec944728: Merge "DO NOT MERGE Disable WiMAX when "Data Enabled" is off" into gingerbread
* commit '
ec94472835787b66e1799110411d5077d0ef37cd':
DO NOT MERGE Disable WiMAX when "Data Enabled" is off
Eric Fischer [Mon, 4 Apr 2011 19:20:38 +0000 (12:20 -0700)]
am
8b312c6c: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '
8b312c6ca1c3f6dc4bec0c7d45bc9509afef4984':
Import revised translations. DO NOT MERGE
Jason parks [Mon, 4 Apr 2011 19:20:33 +0000 (12:20 -0700)]
am
cca2f2f9: Merge "Send out a broadcast that the system is being factory reset." into gingerbread
* commit '
cca2f2f987ab772a4bae3176df7259f59d6502ce':
Send out a broadcast that the system is being factory reset.
Justin Ho [Mon, 4 Apr 2011 19:19:39 +0000 (12:19 -0700)]
am
87805ca3: Updated CDMA roaming icons
* commit '
87805ca3a477e165891baa18efe5239a70d11bc9':
Updated CDMA roaming icons
Jean-Baptiste Queru [Mon, 4 Apr 2011 19:19:26 +0000 (12:19 -0700)]
am
bef31431: No-op - reconcile with open-source gingerbread
* commit '
bef31431cafe100e382a3caf7ea7dce343832d68':
Robert Greenwalt [Mon, 4 Apr 2011 19:18:58 +0000 (12:18 -0700)]
am
27725e8c: Only leave one default network up at a time.
* commit '
27725e8cd1e2eb3b88186ae8d43e437f130b1f84':
Only leave one default network up at a time.
Robert Greenwalt [Mon, 4 Apr 2011 18:23:51 +0000 (11:23 -0700)]
Merge "resolved conflicts for merge of
7544b23e to gingerbread-plus-aosp" into gingerbread-plus-aosp
Robert Greenwalt [Mon, 4 Apr 2011 18:21:23 +0000 (11:21 -0700)]
resolved conflicts for merge of
7544b23e to gingerbread-plus-aosp
Change-Id: I28cf91f473eb9e3e758129b2f4d89827e73049dd
Brad Fitzpatrick [Mon, 4 Apr 2011 18:03:03 +0000 (11:03 -0700)]
am
9907d161: Merge "Fix data corruption when writing to Bluetooth socket"
* commit '
9907d161584415c81de1099678f160da172fd1a6':
Fix data corruption when writing to Bluetooth socket
Brad Fitzpatrick [Mon, 4 Apr 2011 17:49:05 +0000 (10:49 -0700)]
Merge "Fix data corruption when writing to Bluetooth socket"