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

Romain Guy [Tue, 13 Dec 2011 00:51:41 +0000 (16:51 -0800)]

am ebb2c6b3: Merge "Keep shaders to render properly"

* commit 'ebb2c6b36da049b32c1dba6f14f16660d860eb09':
Keep shaders to render properly

commit | commitdiff | tree

Romain Guy [Tue, 13 Dec 2011 00:49:40 +0000 (16:49 -0800)]

Merge "Keep shaders to render properly"

commit | commitdiff | tree

Gilles Debunne [Tue, 13 Dec 2011 00:16:05 +0000 (16:16 -0800)]

am c1761e7f: Fixed build after merge

* commit 'c1761e7fe10390d90b805f373b51ecaabf214dac':
Fixed build after merge

commit | commitdiff | tree

Jamie Gennis [Tue, 13 Dec 2011 00:13:58 +0000 (16:13 -0800)]

am f08403ba: am 74e0fcae: am a1dee3f5: Merge "SurfaceTexture: fix a verbose-log compile error" into ics-mr1

* commit 'f08403ba92999448512c4af7062fe30206e32dcf':
SurfaceTexture: fix a verbose-log compile error

commit | commitdiff | tree

Jamie Gennis [Tue, 13 Dec 2011 00:10:28 +0000 (16:10 -0800)]

am 74e0fcae: am a1dee3f5: Merge "SurfaceTexture: fix a verbose-log compile error" into ics-mr1

* commit '74e0fcaed1cd20ae8632224ff5a5404ff1a6e497':
SurfaceTexture: fix a verbose-log compile error

commit | commitdiff | tree

Raphael [Mon, 12 Dec 2011 23:44:16 +0000 (15:44 -0800)]

am b2bf2471: am ab8d6785: (-s ours) am 2ace3b01: Merge "Merge "AAPT fix printf %zd crash on Windows". Do not merge." into ics-mr1

* commit 'b2bf2471b1f0b4a76660e63f91a8de84cc643da8':
Merge "AAPT fix printf %zd crash on Windows". Do not merge.

commit | commitdiff | tree

Matthew Xie [Mon, 12 Dec 2011 23:44:14 +0000 (15:44 -0800)]

am 470d057a: am 18ad6514: am ed0830c5: Merge "Move broadcastState STATE_TURNING_ON before persistSwitchSetting" into ics-mr1

* commit '470d057aedee2f1a8b88a95419f8b1bb42f2120a':
Move broadcastState STATE_TURNING_ON before persistSwitchSetting

commit | commitdiff | tree

Eric Fischer [Mon, 12 Dec 2011 23:44:12 +0000 (15:44 -0800)]

am 74bc6075: am f3ea0231: (-s ours) am 386f2084: Merge "Import revised translations. DO NOT MERGE" into ics-mr1

* commit '74bc6075e13f871a47622d2a08d91b259448a24e':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

The Android Open Source Project [Mon, 12 Dec 2011 23:44:11 +0000 (15:44 -0800)]

am 8ca8f5ed: am 40375099: Reconcile with ics-mr1-release

* commit '8ca8f5ed128cd31f0122b9d778e0dd37cb8756c9':

commit | commitdiff | tree

The Android Open Source Project [Mon, 12 Dec 2011 23:44:09 +0000 (15:44 -0800)]

am b34027bb: am f14dc291: Merge from ics-mr1

* commit 'b34027bb2fc3394d054986d7bbbcf54261436c11':
Fix drm enumeration order, resolves failure to play forward lock ringtones

commit | commitdiff | tree

Raphael [Mon, 12 Dec 2011 23:39:30 +0000 (15:39 -0800)]

am ab8d6785: (-s ours) am 2ace3b01: Merge "Merge "AAPT fix printf %zd crash on Windows". Do not merge." into ics-mr1

* commit 'ab8d6785dcefa5b2b66f6c042475a0f9f558dd45':
Merge "AAPT fix printf %zd crash on Windows". Do not merge.

commit | commitdiff | tree

Matthew Xie [Mon, 12 Dec 2011 23:39:27 +0000 (15:39 -0800)]

am 18ad6514: am ed0830c5: Merge "Move broadcastState STATE_TURNING_ON before persistSwitchSetting" into ics-mr1

* commit '18ad6514bbeb68a96c12ba1636ab8df8e3945f37':
Move broadcastState STATE_TURNING_ON before persistSwitchSetting

commit | commitdiff | tree

Eric Fischer [Mon, 12 Dec 2011 23:39:23 +0000 (15:39 -0800)]

am f3ea0231: (-s ours) am 386f2084: Merge "Import revised translations. DO NOT MERGE" into ics-mr1

* commit 'f3ea02319fc8d1f882ef7f392c245e197ab858de':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

The Android Open Source Project [Mon, 12 Dec 2011 23:39:19 +0000 (15:39 -0800)]

am 40375099: Reconcile with ics-mr1-release

* commit '40375099d10139b6c96c1db8b8295874d60c712e':

commit | commitdiff | tree

The Android Open Source Project [Mon, 12 Dec 2011 23:39:17 +0000 (15:39 -0800)]

am f14dc291: Merge from ics-mr1

* commit 'f14dc29104340f8ccf9d42aef8dba2cc23f7f5e1':
Fix drm enumeration order, resolves failure to play forward lock ringtones

commit | commitdiff | tree

Irfan Sheriff [Mon, 12 Dec 2011 23:37:53 +0000 (15:37 -0800)]

am afb847a4: Merge "Clean up synchronization"

* commit 'afb847a4692a6e5cded8c7a330d00b70b794896a':
Clean up synchronization

commit | commitdiff | tree

Irfan Sheriff [Mon, 12 Dec 2011 23:35:25 +0000 (15:35 -0800)]

Merge "Clean up synchronization"

commit | commitdiff | tree

Justin Ho [Mon, 12 Dec 2011 23:34:51 +0000 (15:34 -0800)]

am ee8005e6: am df83cfc9: am 1cec30a1: Merge "Quick settings icons updated to match ics style on tablet" into ics-mr1

* commit 'ee8005e6ecbb95dad98cf1badbeb2b66c794b790':
Quick settings icons updated to match ics style on tablet

commit | commitdiff | tree

Jeff Tinker [Mon, 12 Dec 2011 23:34:49 +0000 (15:34 -0800)]

am a6e54945: am dc44e06e: am ef664f62: Merge "Fix drm flag setting missed in false drm recognition fix." into ics-mr1

* commit 'a6e549455a17970b5e7b75686d6cc1c7169d59c3':
Fix drm flag setting missed in false drm recognition fix.

commit | commitdiff | tree

Joe Fernandez [Mon, 12 Dec 2011 23:34:47 +0000 (15:34 -0800)]

am 3f6efeaa: am a4f49ac5: am 4b3227de: am 89c3bc38: Merge "docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6" into ics-mr0

* commit '3f6efeaad72bac766351b91d7c47639ca6d08330':
docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6

commit | commitdiff | tree

Gilles Debunne [Mon, 12 Dec 2011 23:34:45 +0000 (15:34 -0800)]

am 0288c6c5: am f107abec: am caf4ead3: Merge "Blinking cursor in Talk" into ics-mr1

* commit '0288c6c562bcef5ebeb100d32c1f4083c798573d':
Blinking cursor in Talk

commit | commitdiff | tree

The Android Open Source Project [Mon, 12 Dec 2011 23:34:43 +0000 (15:34 -0800)]

am ac9860bb: am 175d5d76: Reconcile with ics-mr1-release

* commit 'ac9860bb738e6536eb4d89d6a4811e67901c6181':

commit | commitdiff | tree

James Dong [Mon, 12 Dec 2011 23:34:41 +0000 (15:34 -0800)]

am b7e02819: am 406dd5d1: am aadbd80b: Fixed the false drm recognition.

* commit 'b7e0281900db002e9aed8dff0e2fbcd8b22bf91d':
Fixed the false drm recognition.

commit | commitdiff | tree

Justin Ho [Mon, 12 Dec 2011 23:30:36 +0000 (15:30 -0800)]

am df83cfc9: am 1cec30a1: Merge "Quick settings icons updated to match ics style on tablet" into ics-mr1

* commit 'df83cfc95c1b909ffcfc31f3dd30262a49cffced':
Quick settings icons updated to match ics style on tablet

commit | commitdiff | tree

Gilles Debunne [Mon, 12 Dec 2011 23:30:25 +0000 (15:30 -0800)]

am 7cb77c1a: resolved conflicts for merge of 1742f20c to master

* commit '7cb77c1a0d86b0fbc8774cd90cc81debc3508be1':
Performance improvements for long text edition.

commit | commitdiff | tree

Jeff Tinker [Mon, 12 Dec 2011 23:30:16 +0000 (15:30 -0800)]

am dc44e06e: am ef664f62: Merge "Fix drm flag setting missed in false drm recognition fix." into ics-mr1

* commit 'dc44e06ef305be8de060af69a468e003e231ba05':
Fix drm flag setting missed in false drm recognition fix.

commit | commitdiff | tree

Joe Fernandez [Mon, 12 Dec 2011 23:30:14 +0000 (15:30 -0800)]

am a4f49ac5: am 4b3227de: am 89c3bc38: Merge "docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6" into ics-mr0

* commit 'a4f49ac5284d7ab97e56e318523652f35d9de0d6':
docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6

commit | commitdiff | tree

Gilles Debunne [Mon, 12 Dec 2011 23:30:10 +0000 (15:30 -0800)]

am f107abec: am caf4ead3: Merge "Blinking cursor in Talk" into ics-mr1

* commit 'f107abec56811dea1ae81c6abc78a68e433c1080':
Blinking cursor in Talk

commit | commitdiff | tree

The Android Open Source Project [Mon, 12 Dec 2011 23:29:56 +0000 (15:29 -0800)]

am 175d5d76: Reconcile with ics-mr1-release

* commit '175d5d76b0aa9808b4214522a6fdf461109560ec':

commit | commitdiff | tree

James Dong [Mon, 12 Dec 2011 23:29:46 +0000 (15:29 -0800)]

am 406dd5d1: am aadbd80b: Fixed the false drm recognition.

* commit '406dd5d1e48752177753666867403542e1f400ca':
Fixed the false drm recognition.

commit | commitdiff | tree

Alex Sakhartchouk [Mon, 12 Dec 2011 23:22:24 +0000 (15:22 -0800)]

Merge "Refactored blur pass code out and added comments." into graphics-dev

commit | commitdiff | tree

Gilles Debunne [Mon, 12 Dec 2011 23:16:42 +0000 (15:16 -0800)]

resolved conflicts for merge of 1742f20c to master

Change-Id: I02d84edfe8cc0b71881884ecec21f831404aa555

commit | commitdiff | tree

Jamie Gennis [Mon, 12 Dec 2011 22:12:33 +0000 (14:12 -0800)]

am a1dee3f5: Merge "SurfaceTexture: fix a verbose-log compile error" into ics-mr1

* commit 'a1dee3f500eccedbf5e50d466315fb28ba812cfc':
SurfaceTexture: fix a verbose-log compile error

commit | commitdiff | tree

Jamie Gennis [Mon, 12 Dec 2011 22:10:04 +0000 (14:10 -0800)]

Merge "SurfaceTexture: fix a verbose-log compile error" into ics-mr1

commit | commitdiff | tree

Robert Greenwalt [Mon, 12 Dec 2011 22:04:30 +0000 (14:04 -0800)]

am cc579b89: Merge "Use the carrier-given dns addrs for tethering."

* commit 'cc579b89fc03f404bf42a385dceaebf5060dd327':
Use the carrier-given dns addrs for tethering.

commit | commitdiff | tree

Robert Greenwalt [Mon, 12 Dec 2011 22:02:02 +0000 (14:02 -0800)]

Merge "Use the carrier-given dns addrs for tethering."

commit | commitdiff | tree

Gilles Debunne [Mon, 12 Dec 2011 21:38:24 +0000 (13:38 -0800)]

am 481c0a26: am afa0a714: am df372289: Merge "Fixed SpellCheckerSessions leak in TextView" into ics-mr1

* commit '481c0a260420a921cdca55130d8d9685d17cf527':
Fixed SpellCheckerSessions leak in TextView

commit | commitdiff | tree

Gilles Debunne [Mon, 12 Dec 2011 21:38:22 +0000 (13:38 -0800)]

am e495cc3f: am e912a16b: am 316ca505: Merge "Re-use SpanSets in TextLine" into ics-mr1

* commit 'e495cc3fd9dbf99fcba4f5a65032c6a5c105eeac':
Re-use SpanSets in TextLine

commit | commitdiff | tree

Joe Malin [Mon, 12 Dec 2011 21:38:20 +0000 (13:38 -0800)]

am c789b600: am 8e94d912: am 556e4ca5: am 0a9005ed: Merge "DOC CHANGE: Package text and Formatter javadoc" into ics-mr0

* commit 'c789b60076aa8ff4b2824ced6c998d667f6945c1':
DOC CHANGE: Package text and Formatter javadoc

commit | commitdiff | tree

Chia-chi Yeh [Mon, 12 Dec 2011 21:38:18 +0000 (13:38 -0800)]

am 2339fe3f: am fa71962f: am 46a4e81d: Merge "VPN: delete the "abort" file before starting VPN daemons." into ics-mr1

* commit '2339fe3f8f89d6254ce05a1b4e9587f0257e8316':
VPN: delete the "abort" file before starting VPN daemons.

commit | commitdiff | tree

Irfan Sheriff [Mon, 12 Dec 2011 21:38:03 +0000 (13:38 -0800)]

am d9dc7fe6: am c34306e4: am 97ff7893: Merge "Fix wifi bring up at boot up" into ics-mr1

* commit 'd9dc7fe61e0daaab6c19189904082436b34747a1':
Fix wifi bring up at boot up

commit | commitdiff | tree

Jake Hamby [Mon, 12 Dec 2011 21:38:01 +0000 (13:38 -0800)]

am 36b8c2e6: am 555fe79c: am c40f70a5: Merge "Swap OK and Cancel buttons in SIM PIN unlock screen to match ICS guidelines." into ics-mr1

* commit '36b8c2e6823531e3f7f5167586c6371241be9585':
Swap OK and Cancel buttons in SIM PIN unlock screen to match ICS guidelines.

commit | commitdiff | tree

Romain Guy [Mon, 12 Dec 2011 21:37:45 +0000 (13:37 -0800)]

am 6752d0ab: Mark color uniform fetched after fetching it

* commit '6752d0ab029a185a42e34e7a933b669e6ed19e89':
Mark color uniform fetched after fetching it

commit | commitdiff | tree

Romain Guy [Mon, 12 Dec 2011 21:37:42 +0000 (13:37 -0800)]

am 11326aa1: Merge "Code cleanup"

* commit '11326aa1b9482fefa0c0bdcb7e48cfeae6f9e33d':
Code cleanup

commit | commitdiff | tree

Romain Guy [Mon, 12 Dec 2011 21:37:39 +0000 (13:37 -0800)]

am ee698a01: Merge "Free up resources by deleting shaders early on"

* commit 'ee698a01bdc9ea7aa2b1cd729109b194a130f9f5':
Free up resources by deleting shaders early on

commit | commitdiff | tree

Raphael [Mon, 12 Dec 2011 21:16:35 +0000 (13:16 -0800)]

am 2ace3b01: Merge "Merge "AAPT fix printf %zd crash on Windows". Do not merge." into ics-mr1

* commit '2ace3b01ab9447ce9fda2f578e31c1c11f4837cb':
Merge "AAPT fix printf %zd crash on Windows". Do not merge.

commit | commitdiff | tree

Gilles Debunne [Mon, 12 Dec 2011 21:15:53 +0000 (13:15 -0800)]

am afa0a714: am df372289: Merge "Fixed SpellCheckerSessions leak in TextView" into ics-mr1

* commit 'afa0a714acb45e90bdda3fd72b529a817a25f2d1':
Fixed SpellCheckerSessions leak in TextView

commit | commitdiff | tree

Gilles Debunne [Mon, 12 Dec 2011 21:15:46 +0000 (13:15 -0800)]

am e912a16b: am 316ca505: Merge "Re-use SpanSets in TextLine" into ics-mr1

* commit 'e912a16ba2a6e913b47893bc99c9a846d7ce80a9':
Re-use SpanSets in TextLine

commit | commitdiff | tree

Joe Malin [Mon, 12 Dec 2011 21:15:36 +0000 (13:15 -0800)]

am 8e94d912: am 556e4ca5: am 0a9005ed: Merge "DOC CHANGE: Package text and Formatter javadoc" into ics-mr0

* commit '8e94d912c6e0fc3c6d5e992b6559a0efc20372be':
DOC CHANGE: Package text and Formatter javadoc

commit | commitdiff | tree

Chia-chi Yeh [Mon, 12 Dec 2011 21:15:34 +0000 (13:15 -0800)]

am fa71962f: am 46a4e81d: Merge "VPN: delete the "abort" file before starting VPN daemons." into ics-mr1

* commit 'fa71962fe4595f484071ac0deb23f68d44932d83':
VPN: delete the "abort" file before starting VPN daemons.

commit | commitdiff | tree

Raphael [Mon, 12 Dec 2011 21:14:12 +0000 (13:14 -0800)]

Merge "Merge "AAPT fix printf %zd crash on Windows". Do not merge." into ics-mr1

commit | commitdiff | tree

Irfan Sheriff [Mon, 12 Dec 2011 20:35:12 +0000 (12:35 -0800)]

am c34306e4: am 97ff7893: Merge "Fix wifi bring up at boot up" into ics-mr1

* commit 'c34306e46e0f53a9478216c2d5fd3129a3bc6f8e':
Fix wifi bring up at boot up

commit | commitdiff | tree

Jake Hamby [Mon, 12 Dec 2011 20:35:09 +0000 (12:35 -0800)]

am 555fe79c: am c40f70a5: Merge "Swap OK and Cancel buttons in SIM PIN unlock screen to match ICS guidelines." into ics-mr1

* commit '555fe79cdf037e7250f04591e60ecc8cff0cb95e':
Swap OK and Cancel buttons in SIM PIN unlock screen to match ICS guidelines.

commit | commitdiff | tree

Matthew Xie [Mon, 12 Dec 2011 20:09:13 +0000 (12:09 -0800)]

am ed0830c5: Merge "Move broadcastState STATE_TURNING_ON before persistSwitchSetting" into ics-mr1

* commit 'ed0830c502d7403d69abfd8247c046ac2746ac8c':
Move broadcastState STATE_TURNING_ON before persistSwitchSetting

commit | commitdiff | tree

Matthew Xie [Mon, 12 Dec 2011 20:07:39 +0000 (12:07 -0800)]

Merge "Move broadcastState STATE_TURNING_ON before persistSwitchSetting" into ics-mr1

commit | commitdiff | tree

Romain Guy [Mon, 12 Dec 2011 19:44:43 +0000 (11:44 -0800)]

Merge "Code cleanup"

commit | commitdiff | tree

Romain Guy [Mon, 12 Dec 2011 19:44:32 +0000 (11:44 -0800)]

Merge "Free up resources by deleting shaders early on"

commit | commitdiff | tree

Eric Fischer [Mon, 12 Dec 2011 19:06:38 +0000 (11:06 -0800)]

am 386f2084: Merge "Import revised translations. DO NOT MERGE" into ics-mr1

* commit '386f208489d85d81755b64e92a84290953accfc0':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Mon, 12 Dec 2011 19:04:39 +0000 (11:04 -0800)]

Merge "Import revised translations. DO NOT MERGE" into ics-mr1

commit | commitdiff | tree

Amith Yamasani [Mon, 12 Dec 2011 17:57:42 +0000 (09:57 -0800)]

am 549d5f88: Merge "Show the current stream\'s volume in the volume panel."

* commit '549d5f88bf96f93de5d10f094bda4a62ac5ebe3a':
Show the current stream's volume in the volume panel.

commit | commitdiff | tree

Amith Yamasani [Mon, 12 Dec 2011 17:56:26 +0000 (09:56 -0800)]

Merge "Show the current stream's volume in the volume panel."

commit | commitdiff | tree

Andreas Huber [Mon, 12 Dec 2011 16:33:48 +0000 (08:33 -0800)]

am 2fc93533: Merge "Support for parsing of "folded" RTSP header values and some tweaks to the AMR assembler"

* commit '2fc93533d2689d510c93931bc02ad602fa0e46f2':
Support for parsing of "folded" RTSP header values and some tweaks to the AMR assembler

commit | commitdiff | tree

Andreas Huber [Mon, 12 Dec 2011 16:32:28 +0000 (08:32 -0800)]

Merge "Support for parsing of "folded" RTSP header values and some tweaks to the AMR assembler"

commit | commitdiff | tree

The Android Open Source Project [Mon, 12 Dec 2011 15:59:17 +0000 (07:59 -0800)]

Reconcile with ics-mr1-release

Change-Id: Ic9c27c987ae88da9ab333632b47837b0ff1dd6d3

commit | commitdiff | tree

The Android Open Source Project [Mon, 12 Dec 2011 15:47:34 +0000 (07:47 -0800)]

Merge from ics-mr1

Change-Id: I209499775ddf68b380d0ec801d558e1dc86ab953

commit | commitdiff | tree

Ben Murdoch [Mon, 12 Dec 2011 11:24:34 +0000 (03:24 -0800)]

am 2ff8cc24: Merge "Clear the WebView picture when a new load starts."

* commit '2ff8cc2438866f791d8fe888573b5fba103e2cd0':
Clear the WebView picture when a new load starts.

commit | commitdiff | tree

Ben Murdoch [Mon, 12 Dec 2011 11:13:46 +0000 (03:13 -0800)]

Merge "Clear the WebView picture when a new load starts."

commit | commitdiff | tree

Owen Lin [Mon, 12 Dec 2011 08:22:07 +0000 (00:22 -0800)]

am 130f62ab: Fix the build. (Change LOGV to ALOGV)

* commit '130f62ab014ad95e6dc03ff219a581c8b93c82e4':
Fix the build. (Change LOGV to ALOGV)

commit | commitdiff | tree

Makoto Onuki [Sat, 10 Dec 2011 21:25:38 +0000 (13:25 -0800)]

am 95ea6d6d: Merge "MCC detection fixes for CountryDetector"

* commit '95ea6d6d5d56a7e9e533abe2837ed2379c4271e1':
MCC detection fixes for CountryDetector

commit | commitdiff | tree

Makoto Onuki [Sat, 10 Dec 2011 21:23:59 +0000 (13:23 -0800)]

Merge "MCC detection fixes for CountryDetector"

commit | commitdiff | tree

Andreas Huber [Sat, 10 Dec 2011 02:11:46 +0000 (18:11 -0800)]

am 1f7817e1: am ebfce84f: am 68f592a8: Merge "Don\'t perform RTSP seeks right away but queue them for 200ms" into ics-mr1

* commit '1f7817e1461f4af304d60cc3849d532288e4d2de':
Don't perform RTSP seeks right away but queue them for 200ms

commit | commitdiff | tree

Andreas Huber [Sat, 10 Dec 2011 02:11:44 +0000 (18:11 -0800)]

am 61a8b530: am aa82c39b: am 0ba9380a: Merge "Fix Bitreader "putBits" implementation, make sure we emulate timestamps" into ics-mr1

* commit '61a8b5301b9cf3abef9f1b9fa5af55912cb9d9c7':
Fix Bitreader "putBits" implementation, make sure we emulate timestamps

commit | commitdiff | tree

Svetoslav Ganov [Sat, 10 Dec 2011 02:11:43 +0000 (18:11 -0800)]

am 47730f15: am 33a3b2ce: am 48b428fb: Merge "NumberPicker getting stuck if scroll wheel not wrapable." into ics-mr1

* commit '47730f1582dfa67909293d6d5b88ff89c5ad6ed5':
NumberPicker getting stuck if scroll wheel not wrapable.

commit | commitdiff | tree

Irfan Sheriff [Sat, 10 Dec 2011 02:11:41 +0000 (18:11 -0800)]

am ecd7798c: am a3c7c358: am 583fdf00: Merge "Handle emergency call back mode correctly" into ics-mr1

* commit 'ecd7798ce45f9c8f1901c9348ad5452e0bc88a95':
Handle emergency call back mode correctly

commit | commitdiff | tree

Gilles Debunne [Sat, 10 Dec 2011 02:11:39 +0000 (18:11 -0800)]

am 70511ade: am b25d417f: am aa4a5713: Merge "Make the Next key navigate between TextViews" into ics-mr1

* commit '70511ade47f75160bdfbf0693145a4b827294136':
Make the Next key navigate between TextViews

commit | commitdiff | tree

Gilles Debunne [Sat, 10 Dec 2011 02:09:36 +0000 (18:09 -0800)]

am 2afcfa42: resolved conflicts for merge of 5371a165 to master

* commit '2afcfa42392996525c6a995b354b241f22429959':
Limit created string size in Spell Checker

commit | commitdiff | tree

Andreas Huber [Sat, 10 Dec 2011 02:09:21 +0000 (18:09 -0800)]

am ebfce84f: am 68f592a8: Merge "Don\'t perform RTSP seeks right away but queue them for 200ms" into ics-mr1

* commit 'ebfce84f7fd3e25fa08c36b155db91df90a59b3d':
Don't perform RTSP seeks right away but queue them for 200ms

commit | commitdiff | tree

Andreas Huber [Sat, 10 Dec 2011 02:09:19 +0000 (18:09 -0800)]

am aa82c39b: am 0ba9380a: Merge "Fix Bitreader "putBits" implementation, make sure we emulate timestamps" into ics-mr1

* commit 'aa82c39bdb4ad9c1fdcb09f3bea11be5197d3ce6':
Fix Bitreader "putBits" implementation, make sure we emulate timestamps

commit | commitdiff | tree

Svetoslav Ganov [Sat, 10 Dec 2011 02:09:16 +0000 (18:09 -0800)]

am 33a3b2ce: am 48b428fb: Merge "NumberPicker getting stuck if scroll wheel not wrapable." into ics-mr1

* commit '33a3b2cecf174cb14097498214131fcfb32ec04c':
NumberPicker getting stuck if scroll wheel not wrapable.

commit | commitdiff | tree

Irfan Sheriff [Sat, 10 Dec 2011 02:09:07 +0000 (18:09 -0800)]

am a3c7c358: am 583fdf00: Merge "Handle emergency call back mode correctly" into ics-mr1

* commit 'a3c7c35873235486787d58fa8310eebd87508bc9':
Handle emergency call back mode correctly

commit | commitdiff | tree

Gilles Debunne [Sat, 10 Dec 2011 02:09:03 +0000 (18:09 -0800)]

am b25d417f: am aa4a5713: Merge "Make the Next key navigate between TextViews" into ics-mr1

* commit 'b25d417fce0e0467187ac187a4dabae75d5dc83d':
Make the Next key navigate between TextViews

commit | commitdiff | tree

Gilles Debunne [Sat, 10 Dec 2011 02:06:34 +0000 (18:06 -0800)]

resolved conflicts for merge of 5371a165 to master

Change-Id: I61830ec96c277ebba9db3e40842597b9c98d53c7

commit | commitdiff | tree

Claudia de Veaux [Sat, 10 Dec 2011 00:43:42 +0000 (16:43 -0800)]

am f3aa0f78: Merge "Edit to string to change "double-touch" to "double-tap" per standard language."

* commit 'f3aa0f78fffeca0dd7b632262def3c78ff7e0e7c':
Edit to string to change "double-touch" to "double-tap" per standard language.

commit | commitdiff | tree

Claudia de Veaux [Sat, 10 Dec 2011 00:42:11 +0000 (16:42 -0800)]

Merge "Edit to string to change "double-touch" to "double-tap" per standard language."

commit | commitdiff | tree

Steven Ross [Sat, 10 Dec 2011 00:31:22 +0000 (16:31 -0800)]

am e4067fac: Merge "Checking whether screen is on in constructor fixes 5658742"

* commit 'e4067faca93ee1669c7b68d5e767317c0bbad9c1':
Checking whether screen is on in constructor fixes 5658742

commit | commitdiff | tree

Steven Ross [Sat, 10 Dec 2011 00:28:39 +0000 (16:28 -0800)]

Merge "Checking whether screen is on in constructor fixes 5658742"

commit | commitdiff | tree

The Android Automerger [Sat, 10 Dec 2011 00:17:04 +0000 (16:17 -0800)]

merge in ics-mr1-release history after reset to ics-mr1

commit | commitdiff | tree

Justin Ho [Fri, 9 Dec 2011 23:43:48 +0000 (15:43 -0800)]

am 1cec30a1: Merge "Quick settings icons updated to match ics style on tablet" into ics-mr1

* commit '1cec30a182c1963beda4b6f11cfae9fa38061e68':
Quick settings icons updated to match ics style on tablet

commit | commitdiff | tree

Justin Ho [Fri, 9 Dec 2011 23:42:10 +0000 (15:42 -0800)]

Merge "Quick settings icons updated to match ics style on tablet" into ics-mr1

commit | commitdiff | tree

Irfan Sheriff [Fri, 9 Dec 2011 23:23:51 +0000 (15:23 -0800)]

am c4ea8dfd: Remove explicit network disabling code

* commit 'c4ea8dfd46a5eeeedd15664a6499ecde32985509':
Remove explicit network disabling code

commit | commitdiff | tree

Jamie Gennis [Fri, 9 Dec 2011 23:07:44 +0000 (15:07 -0800)]

SurfaceTexture: fix a verbose-log compile error

Change-Id: I045231207e068d950bb0cb5085717af5d9454ed1

commit | commitdiff | tree

Eric Fischer [Fri, 9 Dec 2011 23:03:51 +0000 (15:03 -0800)]

am 049bc558: am 8430094c: (-s ours) am ab6b816a: Merge "Import revised translations. DO NOT MERGE" into ics-mr1

* commit '049bc558b3c0dc437dbc67d827318135a772850d':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

The Android Open Source Project [Fri, 9 Dec 2011 23:03:49 +0000 (15:03 -0800)]

am 57c82bf0: am abe0ed49: am 641a5624: Reconcile with ics-mr0-release

* commit '57c82bf0bc369b7313c4a9ddec4ae933d025e91b':

commit | commitdiff | tree

The Android Open Source Project [Fri, 9 Dec 2011 23:03:47 +0000 (15:03 -0800)]

am e2d4301f: am 54854d31: Reconcile with ics-mr0-release ics-mr1-release

* commit 'e2d4301f7119fc21ba5e867d9793cd73e089264b':
More fixing for issue #5366535: Lockscreen has wrong layout...
DO NOT MERGE. Integrate from MR 1 to fix issue #5366535: Lockscreen...

commit | commitdiff | tree

Eric Fischer [Fri, 9 Dec 2011 22:58:10 +0000 (14:58 -0800)]

am 8430094c: (-s ours) am ab6b816a: Merge "Import revised translations. DO NOT MERGE" into ics-mr1

* commit '8430094cd9ecfcb932014ed5ae2d3db095bc7382':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

The Android Open Source Project [Fri, 9 Dec 2011 22:58:07 +0000 (14:58 -0800)]

am abe0ed49: am 641a5624: Reconcile with ics-mr0-release

* commit 'abe0ed4916537bf7244a4723e374591bfcf7e967':

commit | commitdiff | tree

The Android Open Source Project [Fri, 9 Dec 2011 22:57:48 +0000 (14:57 -0800)]

am 54854d31: Reconcile with ics-mr0-release ics-mr1-release

* commit '54854d311731b321e2bb2faec06bacb11d1fe07f':
More fixing for issue #5366535: Lockscreen has wrong layout...
DO NOT MERGE. Integrate from MR 1 to fix issue #5366535: Lockscreen...

commit | commitdiff | tree

Nick Pelly [Fri, 9 Dec 2011 22:38:10 +0000 (14:38 -0800)]

am 1db7a31a: Merge "Add BluetoothAdapter.getRemoteDevice(byte[])"

* commit '1db7a31a45c234eb18bd788264591859bee64815':
Add BluetoothAdapter.getRemoteDevice(byte[])

commit | commitdiff | tree

Nick Pelly [Fri, 9 Dec 2011 22:38:08 +0000 (14:38 -0800)]

am 8c9d0139: Merge "Fix BasicNfcEeTest java package."

* commit '8c9d01391cd257dce65928b462b32df24eb38b82':
Fix BasicNfcEeTest java package.

commit | commitdiff | tree

Nick Pelly [Fri, 9 Dec 2011 22:37:05 +0000 (14:37 -0800)]