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

Elliott Hughes [Thu, 13 Jan 2011 01:18:49 +0000 (17:18 -0800)]

am d91ce5d4: am f7bb4044: Merge "Fix build." into honeycomb

* commit 'd91ce5d4b14d3f948b1d32cb17eb666e5d493ba3':
Fix build.

commit | commitdiff | tree

Elliott Hughes [Thu, 13 Jan 2011 01:16:17 +0000 (17:16 -0800)]

am f7bb4044: Merge "Fix build." into honeycomb

* commit 'f7bb4044e3e11845fd0980ad2393236add5b32ac':
Fix build.

commit | commitdiff | tree

Elliott Hughes [Thu, 13 Jan 2011 01:14:43 +0000 (17:14 -0800)]

Merge "Fix build." into honeycomb

commit | commitdiff | tree

Joe Onorato [Thu, 13 Jan 2011 01:11:27 +0000 (17:11 -0800)]

am d1e3d232: am f4699efb: Merge "Possibly fix bad notification updates." into honeycomb

* commit 'd1e3d232ed7472479e1a7095b8aceac981ea2f4a':
Possibly fix bad notification updates.

commit | commitdiff | tree

Joe Onorato [Thu, 13 Jan 2011 01:09:06 +0000 (17:09 -0800)]

am f4699efb: Merge "Possibly fix bad notification updates." into honeycomb

* commit 'f4699efb635dc7695e346343e9b9024ed225a612':
Possibly fix bad notification updates.

commit | commitdiff | tree

Joe Onorato [Thu, 13 Jan 2011 01:07:11 +0000 (17:07 -0800)]

Merge "Possibly fix bad notification updates." into honeycomb

commit | commitdiff | tree

Carl Shapiro [Thu, 13 Jan 2011 01:06:59 +0000 (17:06 -0800)]

am b0b43c5f: am 0123afbb: Merge "Deprecate the allocation limit interfaces." into honeycomb

* commit 'b0b43c5f5681aa521bb1c80d0eb763654c9c512f':
Deprecate the allocation limit interfaces.

commit | commitdiff | tree

Carl Shapiro [Thu, 13 Jan 2011 01:04:38 +0000 (17:04 -0800)]

am 0123afbb: Merge "Deprecate the allocation limit interfaces." into honeycomb

* commit '0123afbb228c2849f481b5219ce82c070562b04a':
Deprecate the allocation limit interfaces.

commit | commitdiff | tree

Carl Shapiro [Thu, 13 Jan 2011 01:02:18 +0000 (17:02 -0800)]

Merge "Deprecate the allocation limit interfaces." into honeycomb

commit | commitdiff | tree

James Dong [Thu, 13 Jan 2011 00:43:47 +0000 (16:43 -0800)]

am 7f08308f: am 14bdce04: Merge "Remove legacy code that should not be used" into honeycomb

* commit '7f08308fda8b66f20505d8235795b86f5d8d2e36':
Remove legacy code that should not be used

commit | commitdiff | tree

James Dong [Thu, 13 Jan 2011 00:41:36 +0000 (16:41 -0800)]

am 14bdce04: Merge "Remove legacy code that should not be used" into honeycomb

* commit '14bdce0441378b766afca3eaa5ac78dbc2f7c6e1':
Remove legacy code that should not be used

commit | commitdiff | tree

James Dong [Thu, 13 Jan 2011 00:39:43 +0000 (16:39 -0800)]

Merge "Remove legacy code that should not be used" into honeycomb

commit | commitdiff | tree

Romain Guy [Thu, 13 Jan 2011 00:26:29 +0000 (16:26 -0800)]

am 703b0bc9: am d6b13534: Merge "Only enable GL rendering on the main thread." into honeycomb

* commit '703b0bc95313d6b43befce7b8a4ac6f166ccb9dc':
Only enable GL rendering on the main thread.

commit | commitdiff | tree

Romain Guy [Thu, 13 Jan 2011 00:24:27 +0000 (16:24 -0800)]

am d6b13534: Merge "Only enable GL rendering on the main thread." into honeycomb

* commit 'd6b13534d44faee5bf80eb02495c17aa0195d381':
Only enable GL rendering on the main thread.

commit | commitdiff | tree

Romain Guy [Thu, 13 Jan 2011 00:22:48 +0000 (16:22 -0800)]

Merge "Only enable GL rendering on the main thread." into honeycomb

commit | commitdiff | tree

Eric Rowe [Thu, 13 Jan 2011 00:04:01 +0000 (16:04 -0800)]

Merge "Add connect HID/NAP BT stress test"

commit | commitdiff | tree

Amith Yamasani [Thu, 13 Jan 2011 00:02:58 +0000 (16:02 -0800)]

am bf546169: am e1c99a1f: Merge "Remove popup indicator for dialog style preference items." into honeycomb

* commit 'bf546169a20b14329f1eca28d037c81273814fb6':
Remove popup indicator for dialog style preference items.

commit | commitdiff | tree

Amith Yamasani [Thu, 13 Jan 2011 00:00:59 +0000 (16:00 -0800)]

am e1c99a1f: Merge "Remove popup indicator for dialog style preference items." into honeycomb

* commit 'e1c99a1f5bb86066d2e9ea48b27cf60d1b78544b':
Remove popup indicator for dialog style preference items.

commit | commitdiff | tree

Amith Yamasani [Wed, 12 Jan 2011 23:59:02 +0000 (15:59 -0800)]

Merge "Remove popup indicator for dialog style preference items." into honeycomb

commit | commitdiff | tree

Joe Onorato [Wed, 12 Jan 2011 23:50:43 +0000 (15:50 -0800)]

am 0220736e: am 895eee7b: Merge "Remove the volume slider in SystemUI." into honeycomb

* commit '0220736e85b019c58186e47565af1faf58f99885':
Remove the volume slider in SystemUI.

commit | commitdiff | tree

Joe Onorato [Wed, 12 Jan 2011 23:48:45 +0000 (15:48 -0800)]

am 895eee7b: Merge "Remove the volume slider in SystemUI." into honeycomb

* commit '895eee7bac7dad66b51406d23529bec1dc9ad901':
Remove the volume slider in SystemUI.

commit | commitdiff | tree

Joe Onorato [Wed, 12 Jan 2011 23:47:08 +0000 (15:47 -0800)]

Merge "Remove the volume slider in SystemUI." into honeycomb

commit | commitdiff | tree

Gilles Debunne [Wed, 12 Jan 2011 23:44:38 +0000 (15:44 -0800)]

am a39301b1: am 95a95717: New menu_dropdown_panel assets.

* commit 'a39301b1d0b31101b1d3380f0c3e08efaf6d4fc1':
New menu_dropdown_panel assets.

commit | commitdiff | tree

Gilles Debunne [Wed, 12 Jan 2011 23:42:43 +0000 (15:42 -0800)]

am 95a95717: New menu_dropdown_panel assets.

* commit '95a9571702e64857e7d8d7dc6c8a46caec874a6b':
New menu_dropdown_panel assets.

commit | commitdiff | tree

Martijn Coenen [Wed, 12 Jan 2011 23:35:20 +0000 (15:35 -0800)]

am 89bc2378: am 261fa998: am 25be5365: Implement canMakeReadonly().

* commit '89bc23783f2350c834623993835dac32d0862759':
Implement canMakeReadonly().

commit | commitdiff | tree

James Dong [Wed, 12 Jan 2011 23:35:17 +0000 (15:35 -0800)]

am 4fbf60e7: (-s ours) am 0569e589: (-s ours) am 13d1cb56: Merge "Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge" into gingerbread

* commit '4fbf60e724ec6aff3ec8d78a5fdb284e98c914cb':
Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge

commit | commitdiff | tree

Nick Pelly [Wed, 12 Jan 2011 23:35:13 +0000 (15:35 -0800)]

am 167ac435: am 6b9db1d8: am 92939376: Merge "Remove attemptDeadServiceRecovery() from TagTechnology\'s." into gingerbread

* commit '167ac4355948e777b4680d86365fea78b24cdb8f':
Remove attemptDeadServiceRecovery() from TagTechnology's.

commit | commitdiff | tree

Nick Pelly [Wed, 12 Jan 2011 23:35:09 +0000 (15:35 -0800)]

am 6d4372c3: am 19326cdc: (-s ours) am d64d711d: Merge "Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)" into gingerbread

* commit '6d4372c3f498b3047efa261981656dacab8647ea':
Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)

commit | commitdiff | tree

Jason Sams [Wed, 12 Jan 2011 23:32:56 +0000 (15:32 -0800)]

am b7ec5469: am ef56ee31: Merge "WAR driver bug where surfaces of size 0 fail." into honeycomb

* commit 'b7ec54699f51ba3ba30fe7be99babd74117e9eb8':
WAR driver bug where surfaces of size 0 fail.

commit | commitdiff | tree

Huahui Wu [Wed, 12 Jan 2011 23:32:52 +0000 (15:32 -0800)]

am f6a63f95: am 55873051: Merge "b/3344966 pan following the focus point instead the first point." into honeycomb

* commit 'f6a63f95a85a9fb7b2150e437cacc7db66451574':
b/3344966 pan following the focus point instead the first point.

commit | commitdiff | tree

Martijn Coenen [Wed, 12 Jan 2011 23:31:07 +0000 (15:31 -0800)]

am 261fa998: am 25be5365: Implement canMakeReadonly().

* commit '261fa99890ebd1ea15a6067859b0e931a3009859':
Implement canMakeReadonly().

commit | commitdiff | tree

James Dong [Wed, 12 Jan 2011 23:31:01 +0000 (15:31 -0800)]

am 0569e589: (-s ours) am 13d1cb56: Merge "Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge" into gingerbread

* commit '0569e58988bae5f08733e21e8d8adfa61fe89b7f':
Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge

commit | commitdiff | tree

Nick Pelly [Wed, 12 Jan 2011 23:30:53 +0000 (15:30 -0800)]

am 6b9db1d8: am 92939376: Merge "Remove attemptDeadServiceRecovery() from TagTechnology\'s." into gingerbread

* commit '6b9db1d8c808439abc12d572283b7fab50fb5257':
Remove attemptDeadServiceRecovery() from TagTechnology's.

commit | commitdiff | tree

Nick Pelly [Wed, 12 Jan 2011 23:30:41 +0000 (15:30 -0800)]

am 19326cdc: (-s ours) am d64d711d: Merge "Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)" into gingerbread

* commit '19326cdcbf551728c54a844ddebe03b0f5d8d268':
Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)

commit | commitdiff | tree

Jason Sams [Wed, 12 Jan 2011 23:30:18 +0000 (15:30 -0800)]

am ef56ee31: Merge "WAR driver bug where surfaces of size 0 fail." into honeycomb

* commit 'ef56ee316cc361cd6519810ae3ae1051ed6fc79b':
WAR driver bug where surfaces of size 0 fail.

commit | commitdiff | tree

Huahui Wu [Wed, 12 Jan 2011 23:30:14 +0000 (15:30 -0800)]

am 55873051: Merge "b/3344966 pan following the focus point instead the first point." into honeycomb

* commit '558730510963ad80d7a539351b3f1cb16e3040c2':
b/3344966 pan following the focus point instead the first point.

commit | commitdiff | tree

Jason Sams [Wed, 12 Jan 2011 23:28:19 +0000 (15:28 -0800)]

Merge "WAR driver bug where surfaces of size 0 fail." into honeycomb

commit | commitdiff | tree

Huahui Wu [Wed, 12 Jan 2011 23:27:16 +0000 (15:27 -0800)]

Merge "b/3344966 pan following the focus point instead the first point." into honeycomb

commit | commitdiff | tree

Jason Sams [Wed, 12 Jan 2011 23:26:37 +0000 (15:26 -0800)]

am 07e27a11: am 208a1c68: Merge "Implement more of copy2DRange*" into honeycomb

* commit '07e27a11e40089bac689f42f379e2508a26d4115':
Implement more of copy2DRange*

commit | commitdiff | tree

Jason Sams [Wed, 12 Jan 2011 23:24:08 +0000 (15:24 -0800)]

am 208a1c68: Merge "Implement more of copy2DRange*" into honeycomb

* commit '208a1c68ee21930112a3704bf8c46a9f27d8d04d':
Implement more of copy2DRange*

commit | commitdiff | tree

Jason Sams [Wed, 12 Jan 2011 23:22:09 +0000 (15:22 -0800)]

Merge "Implement more of copy2DRange*" into honeycomb

commit | commitdiff | tree

Justin Ho [Wed, 12 Jan 2011 23:10:52 +0000 (15:10 -0800)]

am b1c9d782: am 63be8dd1: Merge "Updated notification sounds for trygon" into honeycomb

* commit 'b1c9d782d071e70f091a7a777e6801f11bd8bb13':
Updated notification sounds for trygon

commit | commitdiff | tree

Romain Guy [Wed, 12 Jan 2011 23:10:41 +0000 (15:10 -0800)]

am b7a0fa5e: am b08ea03c: Merge "Reenable region composition pipeline for layers Bug #3341848" into honeycomb

* commit 'b7a0fa5efbc25c4cc66209e2e88ae01b4921a364':
Reenable region composition pipeline for layers Bug #3341848

commit | commitdiff | tree

Justin Ho [Wed, 12 Jan 2011 23:08:24 +0000 (15:08 -0800)]

am 63be8dd1: Merge "Updated notification sounds for trygon" into honeycomb

* commit '63be8dd178447fce289c940638cd37aa560d9de3':
Updated notification sounds for trygon

commit | commitdiff | tree

Romain Guy [Wed, 12 Jan 2011 23:08:17 +0000 (15:08 -0800)]

am b08ea03c: Merge "Reenable region composition pipeline for layers Bug #3341848" into honeycomb

* commit 'b08ea03c1bbb8bfa2c44d23c50155e3f34a6968c':
Reenable region composition pipeline for layers Bug #3341848

commit | commitdiff | tree

Xia Wang [Wed, 12 Jan 2011 23:07:58 +0000 (15:07 -0800)]

am 3c5637a4: am 1aaae92f: Merge "Wait for Wi-Fi state change before set the state verification criteria. bug: 3336896" into honeycomb

* commit '3c5637a457278489903a97c0c8f65b997387db4c':
Wait for Wi-Fi state change before set the state verification criteria. bug: 3336896

commit | commitdiff | tree

Jamie Gennis [Wed, 12 Jan 2011 23:07:53 +0000 (15:07 -0800)]

am f152f2ef: am 103198a1: Merge "Implement crop & transform for SurfaceTexture." into honeycomb

* commit 'f152f2efa6892f844949b648aecc3b2a91e1d17e':
Implement crop & transform for SurfaceTexture.

commit | commitdiff | tree

Carl Shapiro [Wed, 12 Jan 2011 23:07:50 +0000 (15:07 -0800)]

am 90a18102: am d688e5af: Merge "Remove minimum heap size test now that the underlying interface is gone." into honeycomb

* commit '90a181021922f29c124b9f29411ddd7b0d82b168':
Remove minimum heap size test now that the underlying interface is gone.

commit | commitdiff | tree

Marco Nelissen [Wed, 12 Jan 2011 23:07:46 +0000 (15:07 -0800)]

am 18aa2da2: am a8a656b0: Fix scanning of modified files.

* commit '18aa2da202b5d955d1337c859bdb9155419fdf15':
Fix scanning of modified files.

commit | commitdiff | tree

Kenny Root [Wed, 12 Jan 2011 23:07:40 +0000 (15:07 -0800)]

am c31e095e: am e7b2310a: Merge "Make sure AppCacheTest casts to long" into honeycomb

* commit 'c31e095e2b3b6966f97766a7deee44fe0b92f96b':
Make sure AppCacheTest casts to long

commit | commitdiff | tree

Brad Fitzpatrick [Wed, 12 Jan 2011 23:07:34 +0000 (15:07 -0800)]

am ef5864f1: am 2e390809: Merge "Unhide Content{Resolver,Provider}.call()" into honeycomb

* commit 'ef5864f1bb1418307c40fc8ed4cae7545d8a44dd':
Unhide Content{Resolver,Provider}.call()

commit | commitdiff | tree

Stephen Hines [Wed, 12 Jan 2011 23:07:26 +0000 (15:07 -0800)]

am 564d3602: am a9b1b2a7: Merge "Unhide more of the RS APIs." into honeycomb

* commit '564d36027726b6e245fb1447abbf49cfbc414f5c':
Unhide more of the RS APIs.

commit | commitdiff | tree

Justin Ho [Wed, 12 Jan 2011 23:06:18 +0000 (15:06 -0800)]

Merge "Updated notification sounds for trygon" into honeycomb

commit | commitdiff | tree

Romain Guy [Wed, 12 Jan 2011 23:06:18 +0000 (15:06 -0800)]

Merge "Reenable region composition pipeline for layers Bug #3341848" into honeycomb

commit | commitdiff | tree

Xia Wang [Wed, 12 Jan 2011 23:03:41 +0000 (15:03 -0800)]

am 1aaae92f: Merge "Wait for Wi-Fi state change before set the state verification criteria. bug: 3336896" into honeycomb

* commit '1aaae92f990bad51d503fe692def01191fda4db7':
Wait for Wi-Fi state change before set the state verification criteria. bug: 3336896

commit | commitdiff | tree

Jamie Gennis [Wed, 12 Jan 2011 23:03:37 +0000 (15:03 -0800)]

am 103198a1: Merge "Implement crop & transform for SurfaceTexture." into honeycomb

* commit '103198a10cc22a49270a787d04b8ab484d2ec235':
Implement crop & transform for SurfaceTexture.

commit | commitdiff | tree

Carl Shapiro [Wed, 12 Jan 2011 23:03:34 +0000 (15:03 -0800)]

am d688e5af: Merge "Remove minimum heap size test now that the underlying interface is gone." into honeycomb

* commit 'd688e5af1c95a8b5a482c146cd789c2be45f9663':
Remove minimum heap size test now that the underlying interface is gone.

commit | commitdiff | tree

Marco Nelissen [Wed, 12 Jan 2011 23:03:28 +0000 (15:03 -0800)]

am a8a656b0: Fix scanning of modified files.

* commit 'a8a656b0c595fa876a387a91f8813f88a2d3abe7':
Fix scanning of modified files.

commit | commitdiff | tree

Kenny Root [Wed, 12 Jan 2011 23:03:24 +0000 (15:03 -0800)]

am e7b2310a: Merge "Make sure AppCacheTest casts to long" into honeycomb

* commit 'e7b2310a856889aa1e683104039033ada3f6b696':
Make sure AppCacheTest casts to long

commit | commitdiff | tree

Brad Fitzpatrick [Wed, 12 Jan 2011 23:03:15 +0000 (15:03 -0800)]

am 2e390809: Merge "Unhide Content{Resolver,Provider}.call()" into honeycomb

* commit '2e3908097b1c86004d50c0a070ca6b76a4d0d7c5':
Unhide Content{Resolver,Provider}.call()

commit | commitdiff | tree

Stephen Hines [Wed, 12 Jan 2011 23:03:07 +0000 (15:03 -0800)]

am a9b1b2a7: Merge "Unhide more of the RS APIs." into honeycomb

* commit 'a9b1b2a703b45632d6fb63271e0c00316faa5ec7':
Unhide more of the RS APIs.

commit | commitdiff | tree

Xia Wang [Wed, 12 Jan 2011 22:58:46 +0000 (14:58 -0800)]

Merge "Wait for Wi-Fi state change before set the state verification criteria. bug: 3336896" into honeycomb

commit | commitdiff | tree

Jamie Gennis [Wed, 12 Jan 2011 22:57:29 +0000 (14:57 -0800)]

Merge "Implement crop & transform for SurfaceTexture." into honeycomb

commit | commitdiff | tree

Carl Shapiro [Wed, 12 Jan 2011 22:51:54 +0000 (14:51 -0800)]

Merge "Remove minimum heap size test now that the underlying interface is gone." into honeycomb

commit | commitdiff | tree

Kenny Root [Wed, 12 Jan 2011 22:40:57 +0000 (14:40 -0800)]

Merge "Make sure AppCacheTest casts to long" into honeycomb

commit | commitdiff | tree

Brad Fitzpatrick [Wed, 12 Jan 2011 22:39:50 +0000 (14:39 -0800)]

Merge "Unhide Content{Resolver,Provider}.call()" into honeycomb

commit | commitdiff | tree

Stephen Hines [Wed, 12 Jan 2011 22:39:11 +0000 (14:39 -0800)]

Merge "Unhide more of the RS APIs." into honeycomb

commit | commitdiff | tree

Andreas Huber [Wed, 12 Jan 2011 22:38:17 +0000 (14:38 -0800)]

am 156a3c9b: am 7928ca6f: Merge "Fail to parse duration instead of asserting, if the server response cannot be parsed." into honeycomb

* commit '156a3c9ba702f3159e0b4a76c65606b5f97b276c':
Fail to parse duration instead of asserting, if the server response cannot be parsed.

commit | commitdiff | tree

James Dong [Wed, 12 Jan 2011 22:38:12 +0000 (14:38 -0800)]

am 999fb5a5: am 068b41d5: Merge "Publish MediaMetadataRetriever.java as public API" into honeycomb

* commit '999fb5a5a952ffb0c13ee5d6940fa1a39f165bcd':
Publish MediaMetadataRetriever.java as public API

commit | commitdiff | tree

Dianne Hackborn [Wed, 12 Jan 2011 22:36:03 +0000 (14:36 -0800)]

am 7ca0b1c5: am a353581c: Merge "Fix issue #3344089: runtime restart due to java.lang.StackOverflowError..." into honeycomb

* commit '7ca0b1c58623ad1adfb3324df235d4172e44c83a':
Fix issue #3344089: runtime restart due to java.lang.StackOverflowError...

commit | commitdiff | tree

Romain Guy [Wed, 12 Jan 2011 22:35:59 +0000 (14:35 -0800)]

am dee6089c: am 2e0c5261: Merge "Add logging to the new layers API." into honeycomb

* commit 'dee6089c2de42fcddfd22781c90a2e797b5f592c':
Add logging to the new layers API.

commit | commitdiff | tree

Andreas Huber [Wed, 12 Jan 2011 22:35:46 +0000 (14:35 -0800)]

am 7928ca6f: Merge "Fail to parse duration instead of asserting, if the server response cannot be parsed." into honeycomb

* commit '7928ca6f87af4b70086ecf75383ba43da37da891':
Fail to parse duration instead of asserting, if the server response cannot be parsed.

commit | commitdiff | tree

James Dong [Wed, 12 Jan 2011 22:35:35 +0000 (14:35 -0800)]

am 068b41d5: Merge "Publish MediaMetadataRetriever.java as public API" into honeycomb

* commit '068b41d5d41a4a78c96586b85ea89d464d302548':
Publish MediaMetadataRetriever.java as public API

commit | commitdiff | tree

Andreas Huber [Wed, 12 Jan 2011 22:33:51 +0000 (14:33 -0800)]

Merge "Fail to parse duration instead of asserting, if the server response cannot be parsed." into honeycomb

commit | commitdiff | tree

Mike Lockwood [Wed, 12 Jan 2011 22:33:42 +0000 (14:33 -0800)]

am 0b44f6f5: am 0dd9f4de: MediaScanner: Do not update the file path when updating records already in the database

* commit '0b44f6f588bb8836c1ef94e8b1f70ed49e2be53b':
MediaScanner: Do not update the file path when updating records already in the database

commit | commitdiff | tree

Dianne Hackborn [Wed, 12 Jan 2011 22:33:15 +0000 (14:33 -0800)]

am a353581c: Merge "Fix issue #3344089: runtime restart due to java.lang.StackOverflowError..." into honeycomb

* commit 'a353581c65dba1ca5a27f33a05a0077ffdabf72a':
Fix issue #3344089: runtime restart due to java.lang.StackOverflowError...

commit | commitdiff | tree

Romain Guy [Wed, 12 Jan 2011 22:33:10 +0000 (14:33 -0800)]

am 2e0c5261: Merge "Add logging to the new layers API." into honeycomb

* commit '2e0c52610bd5787d716840c71c54ee23ac3fcdd4':
Add logging to the new layers API.

commit | commitdiff | tree

James Dong [Wed, 12 Jan 2011 22:31:34 +0000 (14:31 -0800)]

Merge "Publish MediaMetadataRetriever.java as public API" into honeycomb

commit | commitdiff | tree

Mike Lockwood [Wed, 12 Jan 2011 22:31:24 +0000 (14:31 -0800)]

am 7ff08aeb: am a2946433: Merge "Media Provider and MTP now use emulated /mnt/sdcard instead of /data/media" into honeycomb

* commit '7ff08aeb7e858513c295e5289f6659b2d1d5574d':
Media Provider and MTP now use emulated /mnt/sdcard instead of /data/media

commit | commitdiff | tree

Mike Lockwood [Wed, 12 Jan 2011 22:31:21 +0000 (14:31 -0800)]

am b43982e1: am c13db225: Merge "Remove permission android.permission.WRITE_MEDIA_STORAGE" into honeycomb

* commit 'b43982e10de1d13734badb2a10d6eaf2ff8fb298':
Remove permission android.permission.WRITE_MEDIA_STORAGE

commit | commitdiff | tree

Mike Lockwood [Wed, 12 Jan 2011 22:30:53 +0000 (14:30 -0800)]

am 0dd9f4de: MediaScanner: Do not update the file path when updating records already in the database

* commit '0dd9f4de3ed681e83bd79ddcd4fd463093d11ed3':
MediaScanner: Do not update the file path when updating records already in the database

commit | commitdiff | tree

Dianne Hackborn [Wed, 12 Jan 2011 22:29:34 +0000 (14:29 -0800)]

Merge "Fix issue #3344089: runtime restart due to java.lang.StackOverflowError..." into honeycomb

commit | commitdiff | tree

Romain Guy [Wed, 12 Jan 2011 22:29:15 +0000 (14:29 -0800)]

Merge "Add logging to the new layers API." into honeycomb

commit | commitdiff | tree

Mike Lockwood [Wed, 12 Jan 2011 22:28:37 +0000 (14:28 -0800)]

am a2946433: Merge "Media Provider and MTP now use emulated /mnt/sdcard instead of /data/media" into honeycomb

* commit 'a29464335a1d164fde0817715d86ba6224d0a61f':
Media Provider and MTP now use emulated /mnt/sdcard instead of /data/media

commit | commitdiff | tree

Mike Lockwood [Wed, 12 Jan 2011 22:28:33 +0000 (14:28 -0800)]

am c13db225: Merge "Remove permission android.permission.WRITE_MEDIA_STORAGE" into honeycomb

* commit 'c13db22581aebe0ad16a833e778eedf947eccd1f':
Remove permission android.permission.WRITE_MEDIA_STORAGE

commit | commitdiff | tree

Mike Lockwood [Wed, 12 Jan 2011 22:25:13 +0000 (14:25 -0800)]

Merge "Media Provider and MTP now use emulated /mnt/sdcard instead of /data/media" into honeycomb

commit | commitdiff | tree

Mike Lockwood [Wed, 12 Jan 2011 22:25:05 +0000 (14:25 -0800)]

Merge "Remove permission android.permission.WRITE_MEDIA_STORAGE" into honeycomb

commit | commitdiff | tree

Romain Guy [Wed, 12 Jan 2011 22:19:51 +0000 (14:19 -0800)]

am 1138401f: am e465b117: Merge "Better debug info for layers." into honeycomb

* commit '1138401f348b2e30dc48c01da9a26e66e51b318c':
Better debug info for layers.

commit | commitdiff | tree

Romain Guy [Wed, 12 Jan 2011 22:17:59 +0000 (14:17 -0800)]

am e465b117: Merge "Better debug info for layers." into honeycomb

* commit 'e465b11745cdc49283c360fb2acf01649f4f4fb0':
Better debug info for layers.

commit | commitdiff | tree

Romain Guy [Wed, 12 Jan 2011 22:15:59 +0000 (14:15 -0800)]

Merge "Better debug info for layers." into honeycomb

commit | commitdiff | tree

Gilles Debunne [Wed, 12 Jan 2011 22:11:31 +0000 (14:11 -0800)]

am ee3aadbc: am 54c38bf0: Merge "New QuickContactBadge holo style." into honeycomb

* commit 'ee3aadbc95a7b337bfef4ba5058c2605b10da357':
New QuickContactBadge holo style.

commit | commitdiff | tree

Gilles Debunne [Wed, 12 Jan 2011 22:09:42 +0000 (14:09 -0800)]

am 54c38bf0: Merge "New QuickContactBadge holo style." into honeycomb

* commit '54c38bf05da42e40b8726ab2b5a33762081e9345':
New QuickContactBadge holo style.

commit | commitdiff | tree

Gilles Debunne [Wed, 12 Jan 2011 22:07:26 +0000 (14:07 -0800)]

Merge "New QuickContactBadge holo style." into honeycomb

commit | commitdiff | tree

Jason Sams [Wed, 12 Jan 2011 21:35:05 +0000 (13:35 -0800)]

am fc6528ec: am 8f597fdf: Merge "Cleanup bitmap uploads Implement standalone mipmap generation." into honeycomb

* commit 'fc6528ecd1c1285c909cb81ca2196c65086944b1':
Cleanup bitmap uploads Implement standalone mipmap generation.

commit | commitdiff | tree

Jason Sams [Wed, 12 Jan 2011 21:33:22 +0000 (13:33 -0800)]

am 8f597fdf: Merge "Cleanup bitmap uploads Implement standalone mipmap generation." into honeycomb

* commit '8f597fdfacd1b9cda6dfebf4f3a1c34d1ffb5b2f':
Cleanup bitmap uploads Implement standalone mipmap generation.

commit | commitdiff | tree

Jason Sams [Wed, 12 Jan 2011 21:30:41 +0000 (13:30 -0800)]

Merge "Cleanup bitmap uploads Implement standalone mipmap generation." into honeycomb

commit | commitdiff | tree

Amith Yamasani [Wed, 12 Jan 2011 21:21:54 +0000 (13:21 -0800)]

am c738ef5b: am fb0a242b: Merge "Use light preference panel drawable for Theme.Light" into honeycomb

* commit 'c738ef5b30f15ab8cbb47257a29cbddf830dddae':
Use light preference panel drawable for Theme.Light

commit | commitdiff | tree

Amith Yamasani [Wed, 12 Jan 2011 21:20:04 +0000 (13:20 -0800)]

am fb0a242b: Merge "Use light preference panel drawable for Theme.Light" into honeycomb

* commit 'fb0a242be65e4ddbda0cbaec1ac949d29568ac25':
Use light preference panel drawable for Theme.Light

commit | commitdiff | tree

Jim Miller [Wed, 12 Jan 2011 21:18:45 +0000 (13:18 -0800)]

am 530f77ea: am a3a078e3: Merge "Fix 3201849: Use custom Drawable for bg in lockscreen" into honeycomb

* commit '530f77ea61f71e2b2fb8b64b1c5c3267393e5d84':
Fix 3201849: Use custom Drawable for bg in lockscreen

commit | commitdiff | tree

Amith Yamasani [Wed, 12 Jan 2011 21:18:20 +0000 (13:18 -0800)]