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

Justin Ho [Tue, 25 Jan 2011 22:07:22 +0000 (14:07 -0800)]

am 6954e9b0: am d00d2925: Merge changes I282a8421,I53d15f37 into honeycomb

* commit '6954e9b0d90c9fe80f370892defb4906848806b4':
Merging Gingerbread assets into Honeycomb
Removing old assets from SystemUI in drawable-hdpi

commit | commitdiff | tree

Jaikumar Ganesh [Tue, 25 Jan 2011 22:07:12 +0000 (14:07 -0800)]

am e4d494b4: am 5cbb1622: Merge "Rename virtual call API to ScoUsingVirtualCall." into honeycomb

* commit 'e4d494b49548eca62bf665fd5954c90731fd18e3':
Rename virtual call API to ScoUsingVirtualCall.

commit | commitdiff | tree

Romain Guy [Tue, 25 Jan 2011 22:07:00 +0000 (14:07 -0800)]

am 535602fe: am 3ac1b0f0: Merge "Prevent crash in View when gathering attributes without an AttachInfo. Bug #3385339" into honeycomb

* commit '535602fe5572e2a648251faf01b4dcd3649d5ede':
Prevent crash in View when gathering attributes without an AttachInfo. Bug #3385339

commit | commitdiff | tree

Justin Ho [Tue, 25 Jan 2011 22:03:55 +0000 (14:03 -0800)]

am d00d2925: Merge changes I282a8421,I53d15f37 into honeycomb

* commit 'd00d2925ca9997c2f0fab1a8b149d91d77b79010':
Merging Gingerbread assets into Honeycomb
Removing old assets from SystemUI in drawable-hdpi

commit | commitdiff | tree

Justin Ho [Tue, 25 Jan 2011 22:01:25 +0000 (14:01 -0800)]

Merge changes I282a8421,I53d15f37 into honeycomb

* changes:
Merging Gingerbread assets into Honeycomb
Removing old assets from SystemUI in drawable-hdpi

commit | commitdiff | tree

Jaikumar Ganesh [Tue, 25 Jan 2011 22:00:32 +0000 (14:00 -0800)]

am 5cbb1622: Merge "Rename virtual call API to ScoUsingVirtualCall." into honeycomb

* commit '5cbb162262cf2dc1a5763ddbdeb4f8ec50c33dba':
Rename virtual call API to ScoUsingVirtualCall.

commit | commitdiff | tree

Romain Guy [Tue, 25 Jan 2011 21:58:08 +0000 (13:58 -0800)]

am 3ac1b0f0: Merge "Prevent crash in View when gathering attributes without an AttachInfo. Bug #3385339" into honeycomb

* commit '3ac1b0f0d4d78568faf7616b2a8b808bdf5c4882':
Prevent crash in View when gathering attributes without an AttachInfo. Bug #3385339

commit | commitdiff | tree

Jaikumar Ganesh [Tue, 25 Jan 2011 21:56:02 +0000 (13:56 -0800)]

Merge "Rename virtual call API to ScoUsingVirtualCall." into honeycomb

commit | commitdiff | tree

Romain Guy [Tue, 25 Jan 2011 21:55:14 +0000 (13:55 -0800)]

Merge "Prevent crash in View when gathering attributes without an AttachInfo. Bug #3385339" into honeycomb

commit | commitdiff | tree

Gilles Debunne [Tue, 25 Jan 2011 21:49:40 +0000 (13:49 -0800)]

am a5b43a04: am c927ec50: Merge "Overscoll bounce amplitude is smaller." into honeycomb

* commit 'a5b43a04921711da8fa09b4f30ff5977f8222954':
Overscoll bounce amplitude is smaller.

commit | commitdiff | tree

Adam Powell [Tue, 25 Jan 2011 21:47:27 +0000 (13:47 -0800)]

am 41cd1ce1: am f72a13ec: Merge "Fix bug 3378333 - Holo-style layout for granting permissions" into honeycomb

* commit '41cd1ce1b97e48190b47447555560702d0843aba':
Fix bug 3378333 - Holo-style layout for granting permissions

commit | commitdiff | tree

Gilles Debunne [Tue, 25 Jan 2011 21:47:24 +0000 (13:47 -0800)]

am c927ec50: Merge "Overscoll bounce amplitude is smaller." into honeycomb

* commit 'c927ec50497bf5f477663deb7b366b37185d46b0':
Overscoll bounce amplitude is smaller.

commit | commitdiff | tree

Adam Powell [Tue, 25 Jan 2011 21:45:19 +0000 (13:45 -0800)]

am f72a13ec: Merge "Fix bug 3378333 - Holo-style layout for granting permissions" into honeycomb

* commit 'f72a13ec76517ff0be297f194c88ceb0d84b85e8':
Fix bug 3378333 - Holo-style layout for granting permissions

commit | commitdiff | tree

Gilles Debunne [Tue, 25 Jan 2011 21:44:32 +0000 (13:44 -0800)]

Merge "Overscoll bounce amplitude is smaller." into honeycomb

commit | commitdiff | tree

Adam Powell [Tue, 25 Jan 2011 21:42:49 +0000 (13:42 -0800)]

Merge "Fix bug 3378333 - Holo-style layout for granting permissions" into honeycomb

commit | commitdiff | tree

Dheeraj Sharma [Tue, 25 Jan 2011 20:55:36 +0000 (12:55 -0800)]

am 4ba9e68f: am b8942108: Merge "Video Editor:Fix for 3375632" into honeycomb

* commit '4ba9e68fa95c59e4f2c7c6b17a663b10a5405f45':
Video Editor:Fix for 3375632

commit | commitdiff | tree

Dheeraj Sharma [Tue, 25 Jan 2011 20:52:38 +0000 (12:52 -0800)]

am b8942108: Merge "Video Editor:Fix for 3375632" into honeycomb

* commit 'b8942108826893657ca0b8b6d5d6d153739a76f6':
Video Editor:Fix for 3375632

commit | commitdiff | tree

Dheeraj Sharma [Tue, 25 Jan 2011 20:50:34 +0000 (12:50 -0800)]

Merge "Video Editor:Fix for 3375632" into honeycomb

commit | commitdiff | tree

Vasu Nori [Tue, 25 Jan 2011 20:50:27 +0000 (12:50 -0800)]

Merge "add extra prams to intent to start Download App in sort-by-size mode"

commit | commitdiff | tree

Amith Yamasani [Tue, 25 Jan 2011 20:41:34 +0000 (12:41 -0800)]

am 7abd7429: am 6bcbf54f: Merge "Heed the focusability flag in SearchView and set the default to true." into honeycomb

* commit '7abd7429d6a43c139daf8dc5eba22e18404e1232':
Heed the focusability flag in SearchView and set the default to true.

commit | commitdiff | tree

Amith Yamasani [Tue, 25 Jan 2011 20:38:40 +0000 (12:38 -0800)]

am 6bcbf54f: Merge "Heed the focusability flag in SearchView and set the default to true." into honeycomb

* commit '6bcbf54feed8ca7c1bf9b509f8581684988d45dd':
Heed the focusability flag in SearchView and set the default to true.

commit | commitdiff | tree

Jeff Brown [Tue, 25 Jan 2011 20:38:22 +0000 (12:38 -0800)]

am 1f26ea13: am 561a434b: Merge "Fix emulator trackball." into honeycomb

* commit '1f26ea1306a018a0d0eac2295a5ca235b9475d86':
Fix emulator trackball.

commit | commitdiff | tree

Jeff Brown [Tue, 25 Jan 2011 20:36:26 +0000 (12:36 -0800)]

am 561a434b: Merge "Fix emulator trackball." into honeycomb

* commit '561a434b9769217b8936eea40b564bb9615f1a12':
Fix emulator trackball.

commit | commitdiff | tree

Amith Yamasani [Tue, 25 Jan 2011 20:35:06 +0000 (12:35 -0800)]

Merge "Heed the focusability flag in SearchView and set the default to true." into honeycomb

commit | commitdiff | tree

Jeff Brown [Tue, 25 Jan 2011 20:33:50 +0000 (12:33 -0800)]

Merge "Fix emulator trackball." into honeycomb

commit | commitdiff | tree

Gilles Debunne [Tue, 25 Jan 2011 19:41:59 +0000 (11:41 -0800)]

am 5d1c7609: am bb37b647: Merge "Fixed CAB background and selection color for legacy applications." into honeycomb

* commit '5d1c76095e64405a80456d23d4a3fa5dd053a72f':
Fixed CAB background and selection color for legacy applications.

commit | commitdiff | tree

Gilles Debunne [Tue, 25 Jan 2011 19:39:39 +0000 (11:39 -0800)]

am bb37b647: Merge "Fixed CAB background and selection color for legacy applications." into honeycomb

* commit 'bb37b6477fe76a045654290f2b998a61ff2632b9':
Fixed CAB background and selection color for legacy applications.

commit | commitdiff | tree

Gilles Debunne [Tue, 25 Jan 2011 19:38:33 +0000 (11:38 -0800)]

am 2b5a62af: am 2a32a39e: Merge "Removed warnings in DynamicLayout" into honeycomb

* commit '2b5a62afdef5efc47e223057de0c867ffafef22d':
Removed warnings in DynamicLayout

commit | commitdiff | tree

Gilles Debunne [Tue, 25 Jan 2011 19:37:54 +0000 (11:37 -0800)]

Merge "Fixed CAB background and selection color for legacy applications." into honeycomb

commit | commitdiff | tree

Gilles Debunne [Tue, 25 Jan 2011 19:36:21 +0000 (11:36 -0800)]

am 2a32a39e: Merge "Removed warnings in DynamicLayout" into honeycomb

* commit '2a32a39e9a0455732724bbbbbdce41e12a8ffb1e':
Removed warnings in DynamicLayout

commit | commitdiff | tree

Gilles Debunne [Tue, 25 Jan 2011 19:34:19 +0000 (11:34 -0800)]

Merge "Removed warnings in DynamicLayout" into honeycomb

commit | commitdiff | tree

Wink Saville [Tue, 25 Jan 2011 19:08:53 +0000 (11:08 -0800)]

am ca7c4a5d: am 774f9be5: Merge "Add debug to CallManager#canDial." into honeycomb

* commit 'ca7c4a5d1c6bc3f312862c0311fa21d0d41ababc':
Add debug to CallManager#canDial.

commit | commitdiff | tree

Romain Guy [Tue, 25 Jan 2011 19:06:25 +0000 (11:06 -0800)]

am 8699aa3a: am 2bd78c9a: Merge "Remove debugging log left by mistake." into honeycomb

* commit '8699aa3a2f097cbb3eaf9019645da474e87355e3':
Remove debugging log left by mistake.

commit | commitdiff | tree

Wink Saville [Tue, 25 Jan 2011 19:06:24 +0000 (11:06 -0800)]

am 774f9be5: Merge "Add debug to CallManager#canDial." into honeycomb

* commit '774f9be5dc02e8a7f742008872c6214e517cb8a3':
Add debug to CallManager#canDial.

commit | commitdiff | tree

Romain Guy [Tue, 25 Jan 2011 19:03:55 +0000 (11:03 -0800)]

am 2bd78c9a: Merge "Remove debugging log left by mistake." into honeycomb

* commit '2bd78c9a9b15d1c5c06d838c1fca77d9748e1c41':
Remove debugging log left by mistake.

commit | commitdiff | tree

Brian Carlstrom [Tue, 25 Jan 2011 19:03:52 +0000 (11:03 -0800)]

am f2b7c844: am 8d37c4ef: Merge "Tracking jarjar of org.bouncycastle to com.android.org.bouncycastle" into honeycomb

* commit 'f2b7c84468c5397b44566c393bec2675d73817b7':
Tracking jarjar of org.bouncycastle to com.android.org.bouncycastle

commit | commitdiff | tree

Marco Nelissen [Tue, 25 Jan 2011 19:03:39 +0000 (11:03 -0800)]

am 8952df72: am 4b440268: am c929677e: Merge "Increase the number of useful bits in the spectrum." into gingerbread

* commit '8952df72402d8edbc60a0285f0dc7e8fce29a96f':
Increase the number of useful bits in the spectrum.

commit | commitdiff | tree

Nick Pelly [Tue, 25 Jan 2011 19:03:35 +0000 (11:03 -0800)]

am 894983f0: am 3b61e47a: am b134223f: Make Mifare Classic increment/decrement operands little endian

* commit '894983f060b8e296335c50165049747d0a33fbc0':
Make Mifare Classic increment/decrement operands little endian

commit | commitdiff | tree

Hung-ying Tyan [Tue, 25 Jan 2011 19:03:31 +0000 (11:03 -0800)]

am b30392d2: am df1cc4ef: am cc019c0c: Merge "Get mute state from active call." into gingerbread

* commit 'b30392d288c6c72a6db00a71a2ca586793161b48':
Get mute state from active call.

commit | commitdiff | tree

Hung-ying Tyan [Tue, 25 Jan 2011 19:03:26 +0000 (11:03 -0800)]

am 2b6d07a5: am 8a424af1: am 14b6d062: Merge changes Ib70e0cf2,I0691cd70 into gingerbread

* commit '2b6d07a51a4692cefea11035eacd257eef24f02c':
SipService: registers broadcast receivers on demand.
SipService: release wake lock for cancelled tasks.

commit | commitdiff | tree

Wink Saville [Tue, 25 Jan 2011 19:02:25 +0000 (11:02 -0800)]

Merge "Add debug to CallManager#canDial." into honeycomb

commit | commitdiff | tree

Romain Guy [Tue, 25 Jan 2011 19:01:55 +0000 (11:01 -0800)]

Merge "Remove debugging log left by mistake." into honeycomb

commit | commitdiff | tree

Brian Carlstrom [Tue, 25 Jan 2011 19:00:24 +0000 (11:00 -0800)]

am 8d37c4ef: Merge "Tracking jarjar of org.bouncycastle to com.android.org.bouncycastle" into honeycomb

* commit '8d37c4efeb853fdc6626f89b5bc0ec79eb451162':
Tracking jarjar of org.bouncycastle to com.android.org.bouncycastle

commit | commitdiff | tree

Marco Nelissen [Tue, 25 Jan 2011 18:58:56 +0000 (10:58 -0800)]

am 4b440268: am c929677e: Merge "Increase the number of useful bits in the spectrum." into gingerbread

* commit '4b44026879723d924ddc306ea1e330a9e87c3a1c':
Increase the number of useful bits in the spectrum.

commit | commitdiff | tree

Nick Pelly [Tue, 25 Jan 2011 18:58:46 +0000 (10:58 -0800)]

am 3b61e47a: am b134223f: Make Mifare Classic increment/decrement operands little endian

* commit '3b61e47a3f173133e5a3cfcbfe6812eb02a0a760':
Make Mifare Classic increment/decrement operands little endian

commit | commitdiff | tree

Hung-ying Tyan [Tue, 25 Jan 2011 18:58:42 +0000 (10:58 -0800)]

am df1cc4ef: am cc019c0c: Merge "Get mute state from active call." into gingerbread

* commit 'df1cc4ef9205239701bbe73f903e89a9dfd2623a':
Get mute state from active call.

commit | commitdiff | tree

Hung-ying Tyan [Tue, 25 Jan 2011 18:58:26 +0000 (10:58 -0800)]

am 8a424af1: am 14b6d062: Merge changes Ib70e0cf2,I0691cd70 into gingerbread

* commit '8a424af1d93a13f3b330ffe39de8aa7c592fdf49':
SipService: registers broadcast receivers on demand.
SipService: release wake lock for cancelled tasks.

commit | commitdiff | tree

Brian Carlstrom [Tue, 25 Jan 2011 18:58:02 +0000 (10:58 -0800)]

Merge "Tracking jarjar of org.bouncycastle to com.android.org.bouncycastle" into honeycomb

commit | commitdiff | tree

Jeff Brown [Tue, 25 Jan 2011 18:56:42 +0000 (10:56 -0800)]

am 2996adb7: (-s ours) am e9acc401: (-s ours) am d8bdc06f: Fix SENSOR_LANDSCAPE and SENSOR_PORTRAIT (DO NOT MERGE)

* commit '2996adb765fe34cf12744019d60b3db86fb31295':
Fix SENSOR_LANDSCAPE and SENSOR_PORTRAIT (DO NOT MERGE)

commit | commitdiff | tree

Andreas Huber [Tue, 25 Jan 2011 18:56:38 +0000 (10:56 -0800)]

am a79ec961: (-s ours) am ca1cf59f: (-s ours) am efebdf4b: DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder

* commit 'a79ec961af59ad754cc338a1d3579f9940246b6f':
DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder

commit | commitdiff | tree

Jeff Brown [Tue, 25 Jan 2011 18:53:51 +0000 (10:53 -0800)]

am e9acc401: (-s ours) am d8bdc06f: Fix SENSOR_LANDSCAPE and SENSOR_PORTRAIT (DO NOT MERGE)

* commit 'e9acc40151db2c5ec3c958c206f7c2e805709e29':
Fix SENSOR_LANDSCAPE and SENSOR_PORTRAIT (DO NOT MERGE)

commit | commitdiff | tree

Andreas Huber [Tue, 25 Jan 2011 18:53:46 +0000 (10:53 -0800)]

am ca1cf59f: (-s ours) am efebdf4b: DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder

* commit 'ca1cf59f495dacb132f2a83cefad41d51141a699':
DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder

commit | commitdiff | tree

Brad Fitzpatrick [Tue, 25 Jan 2011 18:50:59 +0000 (10:50 -0800)]

am 28ae70ce: am 23a813e1: am 996de2dd: Merge "Avoid using String.format in MediaRecorder"

* commit '28ae70ceac7d8295c3ba0dbd644c5cef56dc72b3':
Avoid using String.format in MediaRecorder

commit | commitdiff | tree

Justin Ho [Tue, 25 Jan 2011 18:50:56 +0000 (10:50 -0800)]

am e73a710b: am 7cd1cc83: am 28c4f69a: Updated checkbox assets

* commit 'e73a710bea6e3d925c028e90be43618ee5d23826':
Updated checkbox assets

commit | commitdiff | tree

Brad Fitzpatrick [Tue, 25 Jan 2011 18:48:05 +0000 (10:48 -0800)]

am 23a813e1: am 996de2dd: Merge "Avoid using String.format in MediaRecorder"

* commit '23a813e17d94083c24a34559864722c809b4e0f7':
Avoid using String.format in MediaRecorder

commit | commitdiff | tree

Justin Ho [Tue, 25 Jan 2011 18:47:56 +0000 (10:47 -0800)]

am 7cd1cc83: am 28c4f69a: Updated checkbox assets

* commit '7cd1cc83194fb25b0bcc9d40b20dcff9a427afe8':
Updated checkbox assets

commit | commitdiff | tree

Gilles Debunne [Tue, 25 Jan 2011 18:47:33 +0000 (10:47 -0800)]

am 9eaa9b97: am b6b15dca: Merge "TextLine cache is used, even for long lines of text." into honeycomb

* commit '9eaa9b97d78e3efed1ac497822ca06c03db890cd':
TextLine cache is used, even for long lines of text.

commit | commitdiff | tree

Gilles Debunne [Tue, 25 Jan 2011 18:45:15 +0000 (10:45 -0800)]

am b6b15dca: Merge "TextLine cache is used, even for long lines of text." into honeycomb

* commit 'b6b15dca725b3467ea03fa4c0ae29e6b6e753b27':
TextLine cache is used, even for long lines of text.

commit | commitdiff | tree

Gilles Debunne [Tue, 25 Jan 2011 18:43:05 +0000 (10:43 -0800)]

Merge "TextLine cache is used, even for long lines of text." into honeycomb

commit | commitdiff | tree

Robert Greenwalt [Tue, 25 Jan 2011 18:34:53 +0000 (10:34 -0800)]

am 678c6a35: am d14239a2: Merge "Fix tethering when switching default connection" into honeycomb

* commit '678c6a358dc14beb7825b30346ab09df432ba1fe':
Fix tethering when switching default connection

commit | commitdiff | tree

Shimeng (Simon) Wang [Tue, 25 Jan 2011 18:34:50 +0000 (10:34 -0800)]

am 1dc6b9eb: am c1e7f2d3: Merge "Set high usage delta to 1 to avoid constant V8 GC." into honeycomb

* commit '1dc6b9ebc6ea584b8294e920d0153365c6aa2486':
Set high usage delta to 1 to avoid constant V8 GC.

commit | commitdiff | tree

Arnaud Ferir [Tue, 25 Jan 2011 18:32:39 +0000 (10:32 -0800)]

am 0d128912: am 10ab8617: am 5e81a6e2: Fix trace mismatch.

* commit '0d1289122c2215add91cb86d520a72fd0815b6b6':
Fix trace mismatch.

commit | commitdiff | tree

Sylvain Fonteneau [Tue, 25 Jan 2011 18:32:35 +0000 (10:32 -0800)]

am a2eced30: am e97a42e0: am c5a418ec: Handle mock tags in android.nfc.Tag conversion to Parcel.

* commit 'a2eced302b7a5c4fea6d84c200dbdc5555f0d2b5':
Handle mock tags in android.nfc.Tag conversion to Parcel.

commit | commitdiff | tree

John Wang [Tue, 25 Jan 2011 18:32:31 +0000 (10:32 -0800)]

am c3a5b19c: am 78eb9238: am 93300ce2: Merge "Enable recovery in RIL wakelock release check." into gingerbread

* commit 'c3a5b19c9518cf4cc7206a69015c96119bf35f73':
Enable recovery in RIL wakelock release check.

commit | commitdiff | tree

Robert Greenwalt [Tue, 25 Jan 2011 18:30:36 +0000 (10:30 -0800)]

am d14239a2: Merge "Fix tethering when switching default connection" into honeycomb

* commit 'd14239a2fb12d775f7b2345286d36ac02234e0a7':
Fix tethering when switching default connection

commit | commitdiff | tree

Shimeng (Simon) Wang [Tue, 25 Jan 2011 18:30:33 +0000 (10:30 -0800)]

am c1e7f2d3: Merge "Set high usage delta to 1 to avoid constant V8 GC." into honeycomb

* commit 'c1e7f2d371aa6c2aa9ed3207689cb53a1f704cbc':
Set high usage delta to 1 to avoid constant V8 GC.

commit | commitdiff | tree

Nick Pelly [Tue, 25 Jan 2011 18:30:11 +0000 (10:30 -0800)]

am fd06cc10: resolved conflicts for merge of 0065f398 to honeycomb-plus-aosp

* commit 'fd06cc10ac372a737e37e764b0a01296e778226e':
Add operands to mifare classic increment, decrement.

commit | commitdiff | tree

Arnaud Ferir [Tue, 25 Jan 2011 18:29:59 +0000 (10:29 -0800)]

am 10ab8617: am 5e81a6e2: Fix trace mismatch.

* commit '10ab8617e85c9a675ff8251cd328beb4e047777c':
Fix trace mismatch.

commit | commitdiff | tree

Sylvain Fonteneau [Tue, 25 Jan 2011 18:29:51 +0000 (10:29 -0800)]

am e97a42e0: am c5a418ec: Handle mock tags in android.nfc.Tag conversion to Parcel.

* commit 'e97a42e05cced70dd5713c731a197187b4751800':
Handle mock tags in android.nfc.Tag conversion to Parcel.

commit | commitdiff | tree

John Wang [Tue, 25 Jan 2011 18:29:44 +0000 (10:29 -0800)]

am 78eb9238: am 93300ce2: Merge "Enable recovery in RIL wakelock release check." into gingerbread

* commit '78eb92388ce30aee9b9aaa3e6c9a2de185f8d6a4':
Enable recovery in RIL wakelock release check.

commit | commitdiff | tree

Robert Greenwalt [Tue, 25 Jan 2011 18:27:51 +0000 (10:27 -0800)]

Merge "Fix tethering when switching default connection" into honeycomb

commit | commitdiff | tree

Shimeng (Simon) Wang [Tue, 25 Jan 2011 18:27:24 +0000 (10:27 -0800)]

Merge "Set high usage delta to 1 to avoid constant V8 GC." into honeycomb

commit | commitdiff | tree

Nick Pelly [Tue, 25 Jan 2011 18:26:54 +0000 (10:26 -0800)]

resolved conflicts for merge of 0065f398 to honeycomb-plus-aosp

Change-Id: I1fcb292287f82605db41d330ae840fb5f617847b

commit | commitdiff | tree

Nick Pelly [Tue, 25 Jan 2011 18:22:41 +0000 (10:22 -0800)]

am bdd265ba: resolved conflicts for merge of 12619677 to honeycomb-plus-aosp

* commit 'bdd265ba5fe6b2bf632a7a6eb6df9e187a56126a':
Make MifareClassic methods more consistent.

commit | commitdiff | tree

Nick Pelly [Tue, 25 Jan 2011 18:20:02 +0000 (10:20 -0800)]

resolved conflicts for merge of 12619677 to honeycomb-plus-aosp

Change-Id: I3469ca28b32dd2a8e8011f6f50f9297ba07e933e

commit | commitdiff | tree

Marco Nelissen [Tue, 25 Jan 2011 18:11:09 +0000 (10:11 -0800)]

am c929677e: Merge "Increase the number of useful bits in the spectrum." into gingerbread

* commit 'c929677e017759047d94599faa1b80ebe278fefb':
Increase the number of useful bits in the spectrum.

commit | commitdiff | tree

Jean-Michel Trivi [Tue, 25 Jan 2011 18:10:24 +0000 (10:10 -0800)]

Merge "Bug 3376700 Add support in APM for stream-specific volume curves"

commit | commitdiff | tree

Nick Pelly [Tue, 25 Jan 2011 18:09:00 +0000 (10:09 -0800)]

am 8bfdd9a6: Merge branch \'honeycomb-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp

* commit '8bfdd9a65102c13e6a0786d16bf27083be8a98ff':

commit | commitdiff | tree

Jeff Hamilton [Tue, 25 Jan 2011 18:08:56 +0000 (10:08 -0800)]

am 883b26db: am 535ec16c: am e1e70c57: Merge "Allow null filters for foreground dispatch to act as catch all." into gingerbread

* commit '883b26db47fc1bfdc29963b6987866de0ed318cd':
Allow null filters for foreground dispatch to act as catch all.

commit | commitdiff | tree

Jim Miller [Tue, 25 Jan 2011 18:08:38 +0000 (10:08 -0800)]

am 00e37916: am 1323ab83: am 42a46157: Fix 3379239: Catch exceptions from workaround for OOM.

* commit '00e37916bc121cea928f6bad6d059cbd00e8bf6b':
Fix 3379239: Catch exceptions from workaround for OOM.

commit | commitdiff | tree

Dianne Hackborn [Tue, 25 Jan 2011 18:08:20 +0000 (10:08 -0800)]

am 119919b8: am 1240719a: am bcf2adeb: Merge "aapt: Allow raw "%" in unformatted string-arrays"

* commit '119919b81a2aee7637219ea2c255fc55c886a11f':
aapt: Allow raw "%" in unformatted string-arrays

commit | commitdiff | tree

Marco Nelissen [Tue, 25 Jan 2011 18:06:16 +0000 (10:06 -0800)]

Merge "Increase the number of useful bits in the spectrum." into gingerbread

commit | commitdiff | tree

John Reck [Tue, 25 Jan 2011 18:05:34 +0000 (10:05 -0800)]

am 500c9e99: am 7f532976: Merge "Docs for Origin" into honeycomb

* commit '500c9e99f514bd6b3df9b04ed10a763ea752c138':
Docs for Origin

commit | commitdiff | tree

Nick Pelly [Tue, 25 Jan 2011 18:03:46 +0000 (10:03 -0800)]

Merge branch 'honeycomb-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp

commit | commitdiff | tree

Jeff Hamilton [Tue, 25 Jan 2011 18:03:17 +0000 (10:03 -0800)]

am 535ec16c: am e1e70c57: Merge "Allow null filters for foreground dispatch to act as catch all." into gingerbread

* commit '535ec16c78eada2d32669f5a2f8e3c227a5beecc':
Allow null filters for foreground dispatch to act as catch all.

commit | commitdiff | tree

John Reck [Tue, 25 Jan 2011 18:03:14 +0000 (10:03 -0800)]

am 7f532976: Merge "Docs for Origin" into honeycomb

* commit '7f532976baa54d2935a8ba42cc2c529b7460e57a':
Docs for Origin

commit | commitdiff | tree

Jim Miller [Tue, 25 Jan 2011 18:02:53 +0000 (10:02 -0800)]

am 1323ab83: am 42a46157: Fix 3379239: Catch exceptions from workaround for OOM.

* commit '1323ab83e4be088fd66ad73ea9da617e46382987':
Fix 3379239: Catch exceptions from workaround for OOM.

commit | commitdiff | tree

Dianne Hackborn [Tue, 25 Jan 2011 18:02:46 +0000 (10:02 -0800)]

am 1240719a: am bcf2adeb: Merge "aapt: Allow raw "%" in unformatted string-arrays"

* commit '1240719ae06855d38f1fa159dd73e2109bb9586f':
aapt: Allow raw "%" in unformatted string-arrays

commit | commitdiff | tree

John Reck [Tue, 25 Jan 2011 18:01:16 +0000 (10:01 -0800)]

Merge "Docs for Origin" into honeycomb

commit | commitdiff | tree

Jesse Wilson [Tue, 25 Jan 2011 17:44:24 +0000 (09:44 -0800)]

Merge "Prefer the overload of getDigestAlgorithm spelled correctly."

commit | commitdiff | tree

Mike Lockwood [Tue, 25 Jan 2011 17:41:20 +0000 (09:41 -0800)]

Revert "libutils: Fix race condition in Thread::requestExitAndWait()"

This change turned out to be unnecessary

This reverts commit 4a7f412e1d932f46f6adf079df4d9ee7279bd795.

commit | commitdiff | tree

Nick Pelly [Tue, 25 Jan 2011 17:06:41 +0000 (09:06 -0800)]

am 8847fd85: Merge "Merge commit \'c3563eb9\' into honeycomb-plus-aosp" into honeycomb-plus-aosp

* commit '8847fd8532c12c8d3cf7f68e0313141b6f877434':
Fix getSwitchState.

commit | commitdiff | tree

Nick Pelly [Tue, 25 Jan 2011 16:58:57 +0000 (08:58 -0800)]

Merge "Merge commit 'c3563eb9' into honeycomb-plus-aosp" into honeycomb-plus-aosp

commit | commitdiff | tree

Nick Pelly [Tue, 25 Jan 2011 16:54:29 +0000 (08:54 -0800)]

Merge commit 'c3563eb9' into honeycomb-plus-aosp

Change-Id: I63ff88ae3597ea8722a59d16e66f5ea65ffa3b9e

commit | commitdiff | tree

Nick Pelly [Tue, 25 Jan 2011 16:41:35 +0000 (08:41 -0800)]

am b134223f: Make Mifare Classic increment/decrement operands little endian

* commit 'b134223f91c8801d577cb72e92a37cb65fec717a':
Make Mifare Classic increment/decrement operands little endian

commit | commitdiff | tree

satok [Tue, 25 Jan 2011 16:04:57 +0000 (08:04 -0800)]

am 6ee3bcf6: am 3a92c5fd: Merge "Fix the return value of switch to last ime." into honeycomb

* commit '6ee3bcf6c6b4e8a03903ca029fee5ee5df7668d3':
Fix the return value of switch to last ime.

commit | commitdiff | tree

satok [Tue, 25 Jan 2011 16:02:42 +0000 (08:02 -0800)]

am 3a92c5fd: Merge "Fix the return value of switch to last ime." into honeycomb

* commit '3a92c5fd3262236e0c6969591da7f6cb50dbddfc':
Fix the return value of switch to last ime.

commit | commitdiff | tree

satok [Tue, 25 Jan 2011 16:00:29 +0000 (08:00 -0800)]

Merge "Fix the return value of switch to last ime." into honeycomb

commit | commitdiff | tree

satok [Tue, 25 Jan 2011 15:37:46 +0000 (07:37 -0800)]

am 89bd89a0: am b5627921: Merge "Sort IME by id" into honeycomb

* commit '89bd89a0ddff93da93f50e0137d8a4098cbfe636':
Sort IME by id

commit | commitdiff | tree

Ken Wakasa [Tue, 25 Jan 2011 15:37:33 +0000 (07:37 -0800)]

am 901a8193: am 24a0b71a: Merge "Clip touch event at SoftInputWindow to handle the event from Inset" into honeycomb

* commit '901a81933415811d011d1596a3e2bd65ed2d490e':
Clip touch event at SoftInputWindow to handle the event from Inset