OSDN Git Service
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)]
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"
Brad Fitzpatrick [Mon, 4 Apr 2011 17:17:43 +0000 (10:17 -0700)]
am
2ed72048: Merge "Always return a valid index from Rfc822Tokenizer.findTokenEnd()"
* commit '
2ed72048828cf9f617da971e5d2b8a062de08e5b':
Always return a valid index from Rfc822Tokenizer.findTokenEnd()
Brad Fitzpatrick [Mon, 4 Apr 2011 17:17:35 +0000 (10:17 -0700)]
am
e558a000: Merge "Avoid crash in system server when mounting container"
* commit '
e558a0000389a2523b8d3d3a787db6b4579d2bdc':
Avoid crash in system server when mounting container
Brad Fitzpatrick [Mon, 4 Apr 2011 16:41:10 +0000 (09:41 -0700)]
Merge "Always return a valid index from Rfc822Tokenizer.findTokenEnd()"
Brad Fitzpatrick [Mon, 4 Apr 2011 16:38:16 +0000 (09:38 -0700)]
Merge "Avoid crash in system server when mounting container"
Jason parks [Fri, 1 Apr 2011 20:11:06 +0000 (13:11 -0700)]
Merge "Implement teardown script." into gingerbread
Russell Brenner [Fri, 1 Apr 2011 01:55:26 +0000 (18:55 -0700)]
am
c6b22e27: Updated JBQ\'s original SurfaceTexture stubs to make webkit MR1 buildable
* commit '
c6b22e2727bd3730edd5ad72831a9bb4670d00f3':
Updated JBQ's original SurfaceTexture stubs to make webkit MR1 buildable
Russell Brenner [Fri, 1 Apr 2011 01:55:20 +0000 (18:55 -0700)]
am
49b49f8f: Added include/private/hwui/DrawGlInfo.h
* commit '
49b49f8fb6d094768d4e093353b34271f2da1bfc':
Added include/private/hwui/DrawGlInfo.h
Russell Brenner [Fri, 1 Apr 2011 00:32:20 +0000 (17:32 -0700)]
Updated JBQ's original SurfaceTexture stubs to make webkit MR1 buildable
Change-Id: If1c1610efcc0e0bc6de88c75712baed91624b1a7
James Dong [Thu, 31 Mar 2011 18:20:40 +0000 (11:20 -0700)]
Merge "When read() from AudioRecord returns 0 or negative value, report an error to application. DO NOT MERGE." into gingerbread
Eric Laurent [Wed, 30 Mar 2011 21:55:49 +0000 (14:55 -0700)]
Merge "Issue
4157048: mic gain for VoIP/SIP calls." into gingerbread
Mike Lockwood [Wed, 30 Mar 2011 21:15:51 +0000 (14:15 -0700)]
Merge "DO NOT MERGE: UsbService: Make USB disconnect handling for accessory mode more robust" into gingerbread
Trevor Johns [Wed, 30 Mar 2011 20:50:40 +0000 (13:50 -0700)]
Merge "Fixing line in Market IAB docs that explains how to bind to the MarketService." into gingerbread
Simon Wilson [Wed, 30 Mar 2011 20:26:45 +0000 (13:26 -0700)]
Merge "DO NOT MERGE Disable WiMAX when "Data Enabled" is off" into gingerbread
Eric Fischer [Wed, 30 Mar 2011 17:41:05 +0000 (10:41 -0700)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Jeff Hamilton [Wed, 30 Mar 2011 16:30:40 +0000 (09:30 -0700)]
am
96cf34d3: Merge "Make STOP_APP_SWITCHES signatureOrSystem." into gingerbread
* commit '
96cf34d362a1666683e813af915e4f6e0d1b38a0':
Make STOP_APP_SWITCHES signatureOrSystem.
Irfan Sheriff [Wed, 30 Mar 2011 16:30:32 +0000 (09:30 -0700)]
am
05f14e2b: Merge "DO NOT MERGE Pick upstream intf with valid IP conf" into gingerbread
* commit '
05f14e2bcf78be62b35e85902408ea66103a3881':
DO NOT MERGE Pick upstream intf with valid IP conf
Robert Greenwalt [Wed, 30 Mar 2011 16:30:15 +0000 (09:30 -0700)]
am
568845a7: Merge "Fix some alt-network issues." into gingerbread
* commit '
568845a766cddc4e4c222b4d9de064f8a48da990':
Fix some alt-network issues.
Jason parks [Wed, 30 Mar 2011 15:17:53 +0000 (08:17 -0700)]
Merge "Send out a broadcast that the system is being factory reset." into gingerbread
The Android Open Source Project [Tue, 29 Mar 2011 22:23:08 +0000 (15:23 -0700)]
am
ad663d80: Merge from gingerbread
* commit '
ad663d8040ddd4f3e537117847f20d42797b429e':
egl: fixes for object refcounts
Jean-Baptiste Queru [Tue, 29 Mar 2011 21:05:30 +0000 (14:05 -0700)]
No-op - reconcile with open-source gingerbread
Change-Id: I64beb8dfb6f175eb9a160f1145dad3dc323fc98e
The Android Open Source Project [Tue, 29 Mar 2011 20:54:35 +0000 (13:54 -0700)]
Merge from gingerbread
Change-Id: I31e3da083b642d5c7cf6332095fa228b840ee7bb
Michael I. Gold [Thu, 23 Dec 2010 21:51:36 +0000 (13:51 -0800)]
egl: fixes for object refcounts
eglMakeCurrent() would only deref the previous surfaces if the old and
new contexts were the same. eglTerminate() should not touch TLS.
eglReleaseThread() needs to unbind the current context.
Change-Id: I7f4c090a287ee1e29e4708ae10679fb9d7d8c8c5
Related-Bug:
2964479
Brad Fitzpatrick [Tue, 29 Mar 2011 16:27:16 +0000 (09:27 -0700)]
am
1e7fb7ae: Merge "Error in compound cache-control header."
* commit '
1e7fb7aed7b00cebc8f0e501c911727af6527523':
Error in compound cache-control header.
Brad Fitzpatrick [Tue, 29 Mar 2011 15:55:02 +0000 (08:55 -0700)]
Merge "Error in compound cache-control header."
Brad Fitzpatrick [Mon, 28 Mar 2011 15:26:02 +0000 (08:26 -0700)]
am
f0dbf00d: Merge "Handle OutOfMemoryError when decoding images in ThumbnailUtils"
* commit '
f0dbf00d37c349e8c615045876d6bc89b6bb8c54':
Handle OutOfMemoryError when decoding images in ThumbnailUtils
Brad Fitzpatrick [Mon, 28 Mar 2011 15:15:35 +0000 (08:15 -0700)]
am
1a5a2379: Merge "Unregister callback from binder when vibration is removed"
* commit '
1a5a2379eb3a6cf16fb153aecbc4ac9e85d3ed42':
Unregister callback from binder when vibration is removed
Brad Fitzpatrick [Mon, 28 Mar 2011 15:13:08 +0000 (08:13 -0700)]
Merge "Handle OutOfMemoryError when decoding images in ThumbnailUtils"
Brad Fitzpatrick [Mon, 28 Mar 2011 14:59:08 +0000 (07:59 -0700)]
Merge "Unregister callback from binder when vibration is removed"
Robert Greenwalt [Sat, 26 Mar 2011 15:58:01 +0000 (08:58 -0700)]
Merge "Fix Default route after secondary net use." into gingerbread
Jeff Hamilton [Fri, 25 Mar 2011 21:53:14 +0000 (14:53 -0700)]
Merge "Make STOP_APP_SWITCHES signatureOrSystem." into gingerbread
Irfan Sheriff [Fri, 25 Mar 2011 18:01:02 +0000 (11:01 -0700)]
Merge "DO NOT MERGE Pick upstream intf with valid IP conf" into gingerbread
Robert Greenwalt [Fri, 25 Mar 2011 16:35:53 +0000 (09:35 -0700)]
Merge "Fix some alt-network issues." into gingerbread
Jeff Hamilton [Fri, 25 Mar 2011 03:21:41 +0000 (20:21 -0700)]
am
9c1ef098: Update the value for the NFC shared UID.
* commit '
9c1ef098837bd73044cb970545344dd03f66daa0':
Update the value for the NFC shared UID.
Bart Sears [Thu, 24 Mar 2011 10:36:31 +0000 (03:36 -0700)]
am
6a19759c: Do Not Merge: Cherry-pick change I7667f9b8 to GingerBread
* commit '
6a19759c0fae744e80c032ca3c23932e73e6d9d9':
Do Not Merge: Cherry-pick change I7667f9b8 to GingerBread
Huahui Wu [Thu, 24 Mar 2011 10:35:59 +0000 (03:35 -0700)]
Brad Fitzpatrick [Wed, 23 Mar 2011 19:44:23 +0000 (12:44 -0700)]
am
2e383bc6: Merge "Making it possible to call SIP calls with special allowed chars."
* commit '
2e383bc6445b37d3b37fbc5b7620cd4716c5692c':
Making it possible to call SIP calls with special allowed chars.
Brad Fitzpatrick [Wed, 23 Mar 2011 19:44:18 +0000 (12:44 -0700)]
am
5d5a0ca5: Merge "Fixing the wrong link in YuvImage JavaDoc."
* commit '
5d5a0ca5ebc3f4f60b5ad2afc161b3b8b33953e7':
Fixing the wrong link in YuvImage JavaDoc.
Brad Fitzpatrick [Wed, 23 Mar 2011 19:33:39 +0000 (12:33 -0700)]
Merge "Making it possible to call SIP calls with special allowed chars."
Brad Fitzpatrick [Wed, 23 Mar 2011 19:30:28 +0000 (12:30 -0700)]
Merge "Fixing the wrong link in YuvImage JavaDoc."
Nick Pelly [Tue, 22 Mar 2011 17:14:36 +0000 (10:14 -0700)]
am
e69f4267: Merge "NfcAdapterExtras: reset singleton state if initialization fails." into gingerbread
* commit '
e69f4267e1cdf5353fffa99a0d49f4c9069415b9':
NfcAdapterExtras: reset singleton state if initialization fails.
Nick Pelly [Tue, 22 Mar 2011 16:52:55 +0000 (09:52 -0700)]
Merge "NfcAdapterExtras: reset singleton state if initialization fails." into gingerbread
Simon Wilson [Tue, 22 Mar 2011 01:02:57 +0000 (18:02 -0700)]
am
1ba4897e: Merge "DO NOT MERGE Change WiMAX indicator display" into gingerbread
* commit '
1ba4897e89fc30042a086b26755dfdb80af258dd':
DO NOT MERGE Change WiMAX indicator display
Simon Wilson [Mon, 21 Mar 2011 23:58:41 +0000 (16:58 -0700)]
Merge "DO NOT MERGE Change WiMAX indicator display" into gingerbread
Fred Quintana [Mon, 21 Mar 2011 18:33:34 +0000 (11:33 -0700)]
am
661e9b37: Merge "remove the code that clears the passwords when the sim is replaced with a different one." into gingerbread
* commit '
661e9b371fcc1a2aec5dfd74f2cc65db1d8a77d5':
remove the code that clears the passwords when the sim is replaced with a different one.
Fred Quintana [Mon, 21 Mar 2011 18:04:23 +0000 (11:04 -0700)]
Merge "remove the code that clears the passwords when the sim is replaced with a different one." into gingerbread
Mike Lockwood [Mon, 21 Mar 2011 00:37:33 +0000 (17:37 -0700)]
am
65de3c76: DO NOT MERGE: UsbService: Handle the case where a USB accessory connects as the device is booting
* commit '
65de3c76874386a5c1ffd26690451ecdef972a9e':
DO NOT MERGE: UsbService: Handle the case where a USB accessory connects as the device is booting
Eric Fischer [Fri, 18 Mar 2011 23:06:41 +0000 (16:06 -0700)]
am
c0604255: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '
c0604255a71c0b7114c3f011519160d4812a8100':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 18 Mar 2011 22:22:05 +0000 (15:22 -0700)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Valentin Kravtsov [Fri, 18 Mar 2011 16:04:33 +0000 (09:04 -0700)]
am
125be9c8: Merge "Fixing a race condition in RecognitionService" into gingerbread
* commit '
125be9c85a3bf71add2841d4195905c1e681a83e':
Fixing a race condition in RecognitionService
Valentin Kravtsov [Fri, 18 Mar 2011 15:49:51 +0000 (08:49 -0700)]
Merge "Fixing a race condition in RecognitionService" into gingerbread
Xia Wang [Thu, 17 Mar 2011 23:21:28 +0000 (16:21 -0700)]
am
e12a1a09: Merge "Port wi-fi stress test into GB DO NOT MERGE" into gingerbread
* commit '
e12a1a0949ceaff3e4d203ab6897501fb7bdfb98':
Port wi-fi stress test into GB DO NOT MERGE
Xavier Ducrohet [Thu, 17 Mar 2011 23:21:20 +0000 (16:21 -0700)]
am
c7c8c599: Merge
67450db0 from honeycomb. Do not merge.
* commit '
c7c8c599a636a105db0d2eac3b8b332532a7a40f':
Merge
67450db0 from honeycomb. Do not merge.
Mike Lockwood [Thu, 17 Mar 2011 23:20:56 +0000 (16:20 -0700)]
am
5982bf66: GPS: Restore XTRA downloading at boot.
* commit '
5982bf66d4fdea38105d91ff0f9d38660ac87581':
GPS: Restore XTRA downloading at boot.
Simon Wilson [Thu, 17 Mar 2011 23:20:46 +0000 (16:20 -0700)]
am
3f5995da: Merge "DO NOT MERGE Add images to ERI icon list" into gingerbread
* commit '
3f5995da76541443b7c071bd3acad7590ba222ec':
DO NOT MERGE Add images to ERI icon list
Mike Lockwood [Thu, 17 Mar 2011 23:20:32 +0000 (16:20 -0700)]
am
27d9fb57: DO NOT MERGE: Improve message for the "no app for USB accessory" dialog.
* commit '
27d9fb57168da5b5c1385df5f0c493cf8339933f':
DO NOT MERGE: Improve message for the "no app for USB accessory" dialog.
Xia Wang [Thu, 17 Mar 2011 22:06:40 +0000 (15:06 -0700)]
Merge "Port wi-fi stress test into GB DO NOT MERGE" into gingerbread
Brad Fitzpatrick [Thu, 17 Mar 2011 17:18:15 +0000 (10:18 -0700)]
am
d973bed3: Merge "Removing dead store; it was likely a relict of debuging code."
* commit '
d973bed36cb4d4da1d97f309119f4114f60e7171':
Removing dead store; it was likely a relict of debuging code.
Brad Fitzpatrick [Thu, 17 Mar 2011 16:51:47 +0000 (09:51 -0700)]
Merge "Removing dead store; it was likely a relict of debuging code."
Simon Wilson [Thu, 17 Mar 2011 02:51:07 +0000 (19:51 -0700)]
Merge "DO NOT MERGE Add images to ERI icon list" into gingerbread
Dianne Hackborn [Tue, 15 Mar 2011 21:49:45 +0000 (14:49 -0700)]
am
7c2e76f0: Merge "Improve error reporting for issue #
3183612" into gingerbread
* commit '
7c2e76f0a4daa7e4316e7a85d41d3c391319d955':
Improve error reporting for issue #
3183612
Mike Lockwood [Tue, 15 Mar 2011 21:49:37 +0000 (14:49 -0700)]
am
b0976320: Merge "DO NOT MERGE: Backport more USB accessory changes from honeycomb" into gingerbread
* commit '
b09763209980ff9210cc353f2410598220ec0480':
DO NOT MERGE: Backport more USB accessory changes from honeycomb
Dianne Hackborn [Tue, 15 Mar 2011 21:40:56 +0000 (14:40 -0700)]
Merge "Improve error reporting for issue #
3183612" into gingerbread
Mike Lockwood [Tue, 15 Mar 2011 21:04:54 +0000 (14:04 -0700)]
Merge "DO NOT MERGE: Backport more USB accessory changes from honeycomb" into gingerbread
Xavier Ducrohet [Tue, 15 Mar 2011 18:41:13 +0000 (11:41 -0700)]
am
0a98226e: Merge
9d76581f from honeycomb. do not merge.
* commit '
0a98226e3c8cda46786558147a0eb6a56c3370c0':
Merge
9d76581f from honeycomb. do not merge.
Xavier Ducrohet [Tue, 15 Mar 2011 18:41:10 +0000 (11:41 -0700)]
am
b243aabd: Merge
adaa12cd from honeycomb. do not merge.
* commit '
b243aabdaf1ba6fdfc0579c9f949e00d562456ed':
Merge
adaa12cd from honeycomb. do not merge.
Brad Fitzpatrick [Tue, 15 Mar 2011 18:37:37 +0000 (11:37 -0700)]
am
8d25eab1: Merge "Releasing lock even if exception is thrown."
* commit '
8d25eab10523ac2424dc645dc697126dbadad588':
Releasing lock even if exception is thrown.
Brad Fitzpatrick [Tue, 15 Mar 2011 18:37:32 +0000 (11:37 -0700)]
am
56c4c442: Merge "Lazy initialization must be synchronized to avoid parallel instances cretation."
* commit '
56c4c442c0309aa91958dee6b6ed2d65db7ba17d':
Lazy initialization must be synchronized to avoid parallel instances cretation.
Brad Fitzpatrick [Tue, 15 Mar 2011 18:37:29 +0000 (11:37 -0700)]
am
b98c8fca: Merge "Removing self-assignment statement."
* commit '
b98c8fca954718cb61d6513e623a78f1b0bd0edb':
Removing self-assignment statement.
Brad Fitzpatrick [Tue, 15 Mar 2011 18:37:25 +0000 (11:37 -0700)]
am
8b5345fb: Merge "Fixing self-assignment in copying code."
* commit '
8b5345fb3647fee0ec5882537b6a68bb90f4ac1b':
Fixing self-assignment in copying code.
Xavier Ducrohet [Tue, 15 Mar 2011 18:37:01 +0000 (11:37 -0700)]
am
48a2a5ad: Merge "Merge
6f2fb570 from honeycomb. do not merge." into gingerbread
* commit '
48a2a5ad1b7c4979b1d7baf6add4bc32148a75ae':
Merge
6f2fb570 from honeycomb. do not merge.
Xavier Ducrohet [Tue, 15 Mar 2011 18:36:57 +0000 (11:36 -0700)]
am
14e1f523: Merge "Merge
c12b4093 from honeycomb. do not merge." into gingerbread
* commit '
14e1f523c673315cbc3167448ce9252b455d252c':
Merge
c12b4093 from honeycomb. do not merge.
Brad Fitzpatrick [Tue, 15 Mar 2011 18:33:40 +0000 (11:33 -0700)]
am
9a01a2f2: Merge "Fixing self-assignment in cloning code."
* commit '
9a01a2f2720632aa9cc230a4ebb0ed7aee762eec':
Fixing self-assignment in cloning code.
Brad Fitzpatrick [Tue, 15 Mar 2011 18:33:32 +0000 (11:33 -0700)]
am
7972e382: Merge "Removing repetitive conditional; it simply does nothing except slowing down things."
* commit '
7972e382802348e7914c14507426af450aa7e30c':
Removing repetitive conditional; it simply does nothing except slowing down things.
Brad Fitzpatrick [Tue, 15 Mar 2011 18:33:28 +0000 (11:33 -0700)]
am
38c6e31c: Merge "Removing repetitive conditional; it simply does nothing except slowing down things."
* commit '
38c6e31c88dec226271e02fbfed675181ae938b7':
Removing repetitive conditional; it simply does nothing except slowing down things.
Brad Fitzpatrick [Tue, 15 Mar 2011 18:30:08 +0000 (11:30 -0700)]
am
29d75c9a: Merge "Fixing improper boxing to Integer instead of Long."
* commit '
29d75c9a10a1ff6d60e85a1931d042d3e24d9549':
Fixing improper boxing to Integer instead of Long.
Brad Fitzpatrick [Tue, 15 Mar 2011 18:30:04 +0000 (11:30 -0700)]
am
40b207c1: Merge "Using proper key for removing object from the map."
* commit '
40b207c131e224554e30cde30fe4ee49817432ee':
Using proper key for removing object from the map.
Brad Fitzpatrick [Tue, 15 Mar 2011 18:29:56 +0000 (11:29 -0700)]
am
b37f7e59: Merge changes I81fc2f90,I5e7fd759
* commit '
b37f7e59ee38472bdd3ca5fe66cc847890c862e2':
Using proper key for removing from map.
Removing wrong equals method in comparator.
Xavier Ducrohet [Tue, 15 Mar 2011 18:29:16 +0000 (11:29 -0700)]
Merge "Merge
6f2fb570 from honeycomb. do not merge." into gingerbread
Xavier Ducrohet [Tue, 15 Mar 2011 18:29:07 +0000 (11:29 -0700)]
Merge "Merge
c12b4093 from honeycomb. do not merge." into gingerbread
Brad Fitzpatrick [Tue, 15 Mar 2011 18:23:44 +0000 (11:23 -0700)]
Merge "Releasing lock even if exception is thrown."
Brad Fitzpatrick [Tue, 15 Mar 2011 18:22:43 +0000 (11:22 -0700)]
Merge "Lazy initialization must be synchronized to avoid parallel instances cretation."
OSDN Git Service
