OSDN Git Service
Joe Onorato [Thu, 14 Oct 2010 19:03:07 +0000 (12:03 -0700)]
am
3d828e62: Merge "Do not build pbkdf2gen on non-Linux hosts" into gingerbread
Merge commit '
3d828e62c856074334a00ce7c621050b4d7166e4' into gingerbread-plus-aosp
* commit '
3d828e62c856074334a00ce7c621050b4d7166e4':
Do not build pbkdf2gen on non-Linux hosts
Gilles Debunne [Thu, 14 Oct 2010 19:02:44 +0000 (12:02 -0700)]
am
53ea7f58: Merge "Really leave text selection mode when using the trackball." into gingerbread
Merge commit '
53ea7f58c071563b7c5dd0061df39d3b4bf38a63' into gingerbread-plus-aosp
* commit '
53ea7f58c071563b7c5dd0061df39d3b4bf38a63':
Really leave text selection mode when using the trackball.
Joe Onorato [Thu, 14 Oct 2010 17:59:37 +0000 (10:59 -0700)]
Merge "Do not build pbkdf2gen on non-Linux hosts" into gingerbread
Gilles Debunne [Thu, 14 Oct 2010 17:58:59 +0000 (10:58 -0700)]
Merge "Really leave text selection mode when using the trackball." into gingerbread
Hung-ying Tyan [Thu, 14 Oct 2010 09:15:23 +0000 (02:15 -0700)]
am
bd57eeaf: SipService: add wake lock for multiple components.
Merge commit '
bd57eeafe034cf850225db403700b5dc5db5ebcc' into gingerbread-plus-aosp
* commit '
bd57eeafe034cf850225db403700b5dc5db5ebcc':
SipService: add wake lock for multiple components.
Hung-ying Tyan [Thu, 14 Oct 2010 05:54:20 +0000 (22:54 -0700)]
am
3bb10442: Merge "Make SipService listen to WIFI state change events." into gingerbread
Merge commit '
3bb1044243ad38da35ccddc3e0d6d92d64fefe3e' into gingerbread-plus-aosp
* commit '
3bb1044243ad38da35ccddc3e0d6d92d64fefe3e':
Make SipService listen to WIFI state change events.
Kenny Root [Thu, 14 Oct 2010 05:54:10 +0000 (22:54 -0700)]
am
bdf8034c: Merge "OBB: use PBKDF2 for key generation." into gingerbread
Merge commit '
bdf8034c657147226b2390eef113ff841e0d6065' into gingerbread-plus-aosp
* commit '
bdf8034c657147226b2390eef113ff841e0d6065':
OBB: use PBKDF2 for key generation.
Hung-ying Tyan [Thu, 14 Oct 2010 01:36:31 +0000 (18:36 -0700)]
Merge "Make SipService listen to WIFI state change events." into gingerbread
Kenny Root [Thu, 14 Oct 2010 01:29:43 +0000 (18:29 -0700)]
Merge "OBB: use PBKDF2 for key generation." into gingerbread
Kenny Root [Wed, 13 Oct 2010 22:00:07 +0000 (15:00 -0700)]
OBB: use PBKDF2 for key generation.
Switch to using PBKDF2 for the key generation for OBBs. Any previously
generated OBBs will stop being read correctly. A small pbkdf2gen program
is available to allow generation of appropriate keys with the salts.
Bug:
3059950
Change-Id: If4305c989fd692fd1150eb270dbf751e09c37295
David Brown [Thu, 14 Oct 2010 00:50:43 +0000 (17:50 -0700)]
am
cebe5b2e: Merge "Reduce CallerInfoAsyncQuery logging in user builds (STOPSHIP cleanup)" into gingerbread
Merge commit '
cebe5b2e01f8ebbf9089aebc386caecea232df76' into gingerbread-plus-aosp
* commit '
cebe5b2e01f8ebbf9089aebc386caecea232df76':
Reduce CallerInfoAsyncQuery logging in user builds (STOPSHIP cleanup)
David Brown [Thu, 14 Oct 2010 00:48:05 +0000 (17:48 -0700)]
Merge "Reduce CallerInfoAsyncQuery logging in user builds (STOPSHIP cleanup)" into gingerbread
Justin Ho [Thu, 14 Oct 2010 00:47:19 +0000 (17:47 -0700)]
am
c9110970: Merge "Updated media transport controls" into gingerbread
Merge commit '
c911097095d0dd909abf4f77628f2154be6dbf9a' into gingerbread-plus-aosp
* commit '
c911097095d0dd909abf4f77628f2154be6dbf9a':
Updated media transport controls
Justin Ho [Thu, 14 Oct 2010 00:42:03 +0000 (17:42 -0700)]
Merge "Updated media transport controls" into gingerbread
Justin Ho [Thu, 14 Oct 2010 00:33:36 +0000 (17:33 -0700)]
am
b6634127: Merge "Updating popup center asset (v5)" into gingerbread
Merge commit '
b663412741ca3fa30473106a7bda3a8a95a5e194' into gingerbread-plus-aosp
* commit '
b663412741ca3fa30473106a7bda3a8a95a5e194':
Updating popup center asset (v5)
Justin Ho [Thu, 14 Oct 2010 00:15:00 +0000 (17:15 -0700)]
Merge "Updating popup center asset (v5)" into gingerbread
Jesse Wilson [Thu, 14 Oct 2010 00:02:48 +0000 (17:02 -0700)]
am
3394db7d: Merge "Regenerate preloaded classes for Gingerbread." into gingerbread
Merge commit '
3394db7d9432053e56d86b3f24e64deeb3099950' into gingerbread-plus-aosp
* commit '
3394db7d9432053e56d86b3f24e64deeb3099950':
Regenerate preloaded classes for Gingerbread.
Jesse Wilson [Wed, 13 Oct 2010 23:59:12 +0000 (16:59 -0700)]
Merge "Regenerate preloaded classes for Gingerbread." into gingerbread
Jaikumar Ganesh [Wed, 13 Oct 2010 23:56:27 +0000 (16:56 -0700)]
am
a31cbd61: Merge "Remove STOPSHIP and reduce log spam." into gingerbread
Merge commit '
a31cbd61bc53730d756464b0c273475c4f738066' into gingerbread-plus-aosp
* commit '
a31cbd61bc53730d756464b0c273475c4f738066':
Remove STOPSHIP and reduce log spam.
Vasu Nori [Wed, 13 Oct 2010 23:52:57 +0000 (16:52 -0700)]
am
51679ca8: Merge "bug:
3069735 in Download UI app, handle deletes correctly" into gingerbread
Merge commit '
51679ca89293ef33275b9681018c09be3948bf1c' into gingerbread-plus-aosp
* commit '
51679ca89293ef33275b9681018c09be3948bf1c':
bug:
3069735 in Download UI app, handle deletes correctly
Jaikumar Ganesh [Wed, 13 Oct 2010 23:52:52 +0000 (16:52 -0700)]
Merge "Remove STOPSHIP and reduce log spam." into gingerbread
Vasu Nori [Wed, 13 Oct 2010 23:50:45 +0000 (16:50 -0700)]
Merge "bug:
3069735 in Download UI app, handle deletes correctly" into gingerbread
Jaikumar Ganesh [Wed, 13 Oct 2010 23:48:41 +0000 (16:48 -0700)]
am
c008ca96: Merge "Work around for errant headsets." into gingerbread
Merge commit '
c008ca96bb32289958010dcf8f247c35ab9b1f18' into gingerbread-plus-aosp
* commit '
c008ca96bb32289958010dcf8f247c35ab9b1f18':
Work around for errant headsets.
Jaikumar Ganesh [Wed, 13 Oct 2010 23:44:17 +0000 (16:44 -0700)]
Merge "Work around for errant headsets." into gingerbread
Mindy Pereira [Wed, 13 Oct 2010 23:34:27 +0000 (16:34 -0700)]
am
998c6777: Merge "Never show overscroll if the page scrolls at all." into gingerbread
Merge commit '
998c67774aa2260ed05a39df45d983feb72e683c' into gingerbread-plus-aosp
* commit '
998c67774aa2260ed05a39df45d983feb72e683c':
Never show overscroll if the page scrolls at all.
Mindy Pereira [Wed, 13 Oct 2010 23:31:18 +0000 (16:31 -0700)]
Merge "Never show overscroll if the page scrolls at all." into gingerbread
Mindy Pereira [Wed, 13 Oct 2010 23:25:59 +0000 (16:25 -0700)]
am
868322ce: Merge "Reduce the time it takes to decay the glow after a pull." into gingerbread
Merge commit '
868322ced806ec58750edd8ce964f4e17507ddad' into gingerbread-plus-aosp
* commit '
868322ced806ec58750edd8ce964f4e17507ddad':
Reduce the time it takes to decay the glow after a pull.
Mindy Pereira [Wed, 13 Oct 2010 23:23:15 +0000 (16:23 -0700)]
Merge "Reduce the time it takes to decay the glow after a pull." into gingerbread
Mathias Agopian [Wed, 13 Oct 2010 22:59:42 +0000 (15:59 -0700)]
am
011b5bcc: Merge "implement part of [
3094280] New animation for screen on and screen off add support for screen on animation" into gingerbread
Merge commit '
011b5bcc0355338b7ff906656282a54ffaa04b5a' into gingerbread-plus-aosp
* commit '
011b5bcc0355338b7ff906656282a54ffaa04b5a':
implement part of [
3094280] New animation for screen on and screen off
Mathias Agopian [Wed, 13 Oct 2010 22:55:57 +0000 (15:55 -0700)]
Merge "implement part of [
3094280] New animation for screen on and screen off add support for screen on animation" into gingerbread
Andreas Huber [Wed, 13 Oct 2010 22:50:27 +0000 (15:50 -0700)]
am
90d59d18: Merge "Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that." into gingerbread
Merge commit '
90d59d180bd963f00161e6bfaabfda432960cab6' into gingerbread-plus-aosp
* commit '
90d59d180bd963f00161e6bfaabfda432960cab6':
Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that.
Andreas Huber [Wed, 13 Oct 2010 22:46:18 +0000 (15:46 -0700)]
Merge "Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that." into gingerbread
Jean-Baptiste Queru [Wed, 13 Oct 2010 22:26:15 +0000 (15:26 -0700)]
Merge "ignore - a similar change already exists" into gingerbread-plus-aosp
Jean-Baptiste Queru [Wed, 13 Oct 2010 22:23:17 +0000 (15:23 -0700)]
ignore - a similar change already exists
Change-Id: I5e8be06213161c7f3ab284a74030b6117bb43dab
Dan Morrill [Wed, 13 Oct 2010 22:23:27 +0000 (15:23 -0700)]
am
5c62ab0a: Merge "Adding a new <uses-gl-texture/> tag, to be used to enable apps to specify filtering based on support for OpenGL ES texture and texture compression formats." into gingerbread
Merge commit '
5c62ab0af9dadc3bccdad7b01c3ae17266f0b0e1' into gingerbread-plus-aosp
* commit '
5c62ab0af9dadc3bccdad7b01c3ae17266f0b0e1':
Adding a new <uses-gl-texture/> tag, to be used to enable apps to specify
Dan Morrill [Wed, 13 Oct 2010 22:20:34 +0000 (15:20 -0700)]
Merge "Adding a new <uses-gl-texture/> tag, to be used to enable apps to specify filtering based on support for OpenGL ES texture and texture compression formats." into gingerbread
Kenny Root [Wed, 13 Oct 2010 21:53:23 +0000 (14:53 -0700)]
am
361a6ad1: Merge "Handle native library deletion in scanPackage" into gingerbread
Merge commit '
361a6ad16dedfed871c76e8fa64eb45aa82a0088' into gingerbread-plus-aosp
* commit '
361a6ad16dedfed871c76e8fa64eb45aa82a0088':
Handle native library deletion in scanPackage
Kenny Root [Wed, 13 Oct 2010 21:53:18 +0000 (14:53 -0700)]
am
49ec3dff: Merge "OBB: Change documentation to reflect reality" into gingerbread
Merge commit '
49ec3dff4350209e109fc11dafe4294acea36146' into gingerbread-plus-aosp
* commit '
49ec3dff4350209e109fc11dafe4294acea36146':
OBB: Change documentation to reflect reality
Kenny Root [Wed, 13 Oct 2010 21:50:29 +0000 (14:50 -0700)]
Merge "Handle native library deletion in scanPackage" into gingerbread
Kenny Root [Wed, 13 Oct 2010 21:49:41 +0000 (14:49 -0700)]
Merge "OBB: Change documentation to reflect reality" into gingerbread
Andreas Huber [Wed, 13 Oct 2010 21:28:52 +0000 (14:28 -0700)]
am
5f423917: Merge "Attempt to derive the avg. bitrate of the entire stream from metadata." into gingerbread
Merge commit '
5f42391701c0657d520d00f62a4c061b18ba1280' into gingerbread-plus-aosp
* commit '
5f42391701c0657d520d00f62a4c061b18ba1280':
Attempt to derive the avg. bitrate of the entire stream from metadata.
Mathias Agopian [Tue, 12 Oct 2010 23:05:48 +0000 (16:05 -0700)]
implement part of [
3094280] New animation for screen on and screen off
add support for screen on animation
Change-Id: If50cf52ae04b95b42da7d74cf7fa96d5cb54d238
Andreas Huber [Wed, 13 Oct 2010 21:25:32 +0000 (14:25 -0700)]
Merge "Attempt to derive the avg. bitrate of the entire stream from metadata." into gingerbread
Andreas Huber [Wed, 13 Oct 2010 21:22:57 +0000 (14:22 -0700)]
am
646e0d5a: Merge "Some webcams output rtp streams but never send any rtcp data in violation of the specs. Attempt to use fake timestamps to be able to play these..." into gingerbread
Merge commit '
646e0d5ab342f414f556574f2d078bd6deb22ed3' into gingerbread-plus-aosp
* commit '
646e0d5ab342f414f556574f2d078bd6deb22ed3':
Some webcams output rtp streams but never send any rtcp data in violation of
Kenny Root [Wed, 13 Oct 2010 21:22:19 +0000 (14:22 -0700)]
am
e6ae5c39: Merge "Add shutdown assurance" into gingerbread
Merge commit '
e6ae5c39848d2a3a6f3fb750811550969799e410' into gingerbread-plus-aosp
* commit '
e6ae5c39848d2a3a6f3fb750811550969799e410':
Add shutdown assurance
Andreas Huber [Wed, 13 Oct 2010 20:45:57 +0000 (13:45 -0700)]
Merge "Some webcams output rtp streams but never send any rtcp data in violation of the specs. Attempt to use fake timestamps to be able to play these..." into gingerbread
Kenny Root [Wed, 13 Oct 2010 20:19:25 +0000 (13:19 -0700)]
Merge "Add shutdown assurance" into gingerbread
Wink Saville [Wed, 13 Oct 2010 19:27:22 +0000 (12:27 -0700)]
am
07e1be62: Merge "Fix NPE caused by Change I4df27119." into gingerbread
Merge commit '
07e1be62c7a8650313e7ad8690968c58ec8e88ad' into gingerbread-plus-aosp
* commit '
07e1be62c7a8650313e7ad8690968c58ec8e88ad':
Fix NPE caused by Change I4df27119.
Scott Main [Wed, 13 Oct 2010 19:27:08 +0000 (12:27 -0700)]
am
eb4ef072: am
5249ad03: docs: add "boot completed" broadcast to list of DO NOTs for installing on external storage bug:
3088494
Merge commit '
eb4ef07223030eb61d8cf99771e657b7fc0108d0' into gingerbread-plus-aosp
* commit '
eb4ef07223030eb61d8cf99771e657b7fc0108d0':
docs: add "boot completed" broadcast to list of DO NOTs for installing on external storage
Wink Saville [Wed, 13 Oct 2010 19:17:05 +0000 (12:17 -0700)]
Merge "Fix NPE caused by Change I4df27119." into gingerbread
Scott Main [Wed, 13 Oct 2010 19:08:02 +0000 (12:08 -0700)]
am
5249ad03: docs: add "boot completed" broadcast to list of DO NOTs for installing on external storage bug:
3088494
Merge commit '
5249ad03454301744374d04e04b38aaad3b01530' into gingerbread
* commit '
5249ad03454301744374d04e04b38aaad3b01530':
docs: add "boot completed" broadcast to list of DO NOTs for installing on external storage
Nick Pelly [Wed, 13 Oct 2010 17:18:58 +0000 (10:18 -0700)]
am
527d8bbd: Merge "Add missing native methods to fix boot." into gingerbread
Merge commit '
527d8bbd79c1ff2b6e24d19fe9e7a1ecdb72891a' into gingerbread-plus-aosp
* commit '
527d8bbd79c1ff2b6e24d19fe9e7a1ecdb72891a':
Add missing native methods to fix boot.
Nick Pelly [Wed, 13 Oct 2010 17:16:49 +0000 (10:16 -0700)]
Merge "Add missing native methods to fix boot." into gingerbread
Andreas Huber [Wed, 13 Oct 2010 16:19:28 +0000 (09:19 -0700)]
am
312644cd: Merge "Support for writing to MPEG2 transport stream files." into gingerbread
Merge commit '
312644cdbb39522fe9cac028b15b907ce0e8e0f7' into gingerbread-plus-aosp
* commit '
312644cdbb39522fe9cac028b15b907ce0e8e0f7':
Support for writing to MPEG2 transport stream files.
Andreas Huber [Wed, 13 Oct 2010 16:17:13 +0000 (09:17 -0700)]
am
165c6579: Merge "HTTP Live content that are tagged as complete are now seekable." into gingerbread
Merge commit '
165c6579660c22edafb61fee2a0cf39334a2a905' into gingerbread-plus-aosp
* commit '
165c6579660c22edafb61fee2a0cf39334a2a905':
HTTP Live content that are tagged as complete are now seekable.
Andreas Huber [Wed, 13 Oct 2010 16:14:40 +0000 (09:14 -0700)]
Merge "Support for writing to MPEG2 transport stream files." into gingerbread
Andreas Huber [Wed, 13 Oct 2010 16:14:13 +0000 (09:14 -0700)]
Merge "HTTP Live content that are tagged as complete are now seekable." into gingerbread
Leon Scroggins [Wed, 13 Oct 2010 14:56:38 +0000 (07:56 -0700)]
am
dfc07279: Line up WebTextView text with the page.
Merge commit '
dfc07279fc6205c38f5f39cb5ba4f0aef6b593a4' into gingerbread-plus-aosp
* commit '
dfc07279fc6205c38f5f39cb5ba4f0aef6b593a4':
Line up WebTextView text with the page.
Mike Lockwood [Wed, 13 Oct 2010 12:52:51 +0000 (05:52 -0700)]
am
c792c2e9: Merge "GPS: Remove unnecessary and broken test in AgpsRilInterface updateNetworkState glue" into gingerbread
Merge commit '
c792c2e9edb3c785208560b6961ac6ed5b07eb4e' into gingerbread-plus-aosp
* commit '
c792c2e9edb3c785208560b6961ac6ed5b07eb4e':
GPS: Remove unnecessary and broken test in AgpsRilInterface updateNetworkState glue
Mike Lockwood [Wed, 13 Oct 2010 12:46:15 +0000 (05:46 -0700)]
Merge "GPS: Remove unnecessary and broken test in AgpsRilInterface updateNetworkState glue" into gingerbread
Justin Ho [Wed, 13 Oct 2010 03:32:56 +0000 (20:32 -0700)]
am
e03471e1: Merge "Updated popup_ 9 patches and removing text_select_handle (hdpi)" into gingerbread
Merge commit '
e03471e12f1adcd818b5bfd9dcb894c75fe955c5' into gingerbread-plus-aosp
* commit '
e03471e12f1adcd818b5bfd9dcb894c75fe955c5':
Updated popup_ 9 patches and removing text_select_handle (hdpi)
Justin Ho [Wed, 13 Oct 2010 03:30:36 +0000 (20:30 -0700)]
Merge "Updated popup_ 9 patches and removing text_select_handle (hdpi)" into gingerbread
Justin Ho [Wed, 13 Oct 2010 03:24:37 +0000 (20:24 -0700)]
am
33bae9b8: Updated lockscreen asset (Hiroshi), new menu background
Merge commit '
33bae9b826145677585a2171f4986d4c6433fd0d' into gingerbread-plus-aosp
* commit '
33bae9b826145677585a2171f4986d4c6433fd0d':
Updated lockscreen asset (Hiroshi), new menu background
Hung-ying Tyan [Wed, 13 Oct 2010 02:46:14 +0000 (19:46 -0700)]
am
f1b1eec9: Merge "SipService: mScreenOn is flipped to wrong value." into gingerbread
Merge commit '
f1b1eec9de1ca27b660f6c00487de07a30eecf64' into gingerbread-plus-aosp
* commit '
f1b1eec9de1ca27b660f6c00487de07a30eecf64':
SipService: mScreenOn is flipped to wrong value.
Hung-ying Tyan [Wed, 13 Oct 2010 02:44:17 +0000 (19:44 -0700)]
Merge "SipService: mScreenOn is flipped to wrong value." into gingerbread
Nick Pelly [Wed, 13 Oct 2010 02:25:57 +0000 (19:25 -0700)]
am
ab39f1ef: Merge "Fix build." into gingerbread
Merge commit '
ab39f1ef13a546e38b49bfc02dca2ec771c13831' into gingerbread-plus-aosp
* commit '
ab39f1ef13a546e38b49bfc02dca2ec771c13831':
Fix build.
Nick Pelly [Wed, 13 Oct 2010 02:23:13 +0000 (19:23 -0700)]
Merge "Fix build." into gingerbread
Dianne Hackborn [Wed, 13 Oct 2010 02:08:49 +0000 (19:08 -0700)]
am
259c8499: Merge "Fix issue #
3089800: adb shell am -W causes ActivityManager crash" into gingerbread
Merge commit '
259c849989ccd30b0bb4569d11f125ed2c0c1911' into gingerbread-plus-aosp
* commit '
259c849989ccd30b0bb4569d11f125ed2c0c1911':
Fix issue #
3089800: adb shell am -W causes ActivityManager crash
Dianne Hackborn [Wed, 13 Oct 2010 02:06:37 +0000 (19:06 -0700)]
Merge "Fix issue #
3089800: adb shell am -W causes ActivityManager crash" into gingerbread
Jaikumar Ganesh [Wed, 13 Oct 2010 02:06:13 +0000 (19:06 -0700)]
am
64f42803: Merge "Bluez doesn\'t handle disconnect while connecting well. Defer the message." into gingerbread
Merge commit '
64f4280313c5b498a3238d174c4d14ca2187604b' into gingerbread-plus-aosp
* commit '
64f4280313c5b498a3238d174c4d14ca2187604b':
Bluez doesn't handle disconnect while connecting well.
Jaikumar Ganesh [Wed, 13 Oct 2010 02:02:46 +0000 (19:02 -0700)]
Merge "Bluez doesn't handle disconnect while connecting well. Defer the message." into gingerbread
Nick Pelly [Wed, 13 Oct 2010 02:00:54 +0000 (19:00 -0700)]
am
590b73bc: NFC API revision round 2.
Merge commit '
590b73bc5b8e5f7b59bff1d9264a52388a5162e6' into gingerbread-plus-aosp
* commit '
590b73bc5b8e5f7b59bff1d9264a52388a5162e6':
NFC API revision round 2.
Justin Ho [Wed, 13 Oct 2010 00:40:47 +0000 (17:40 -0700)]
am
45738f67: Merge "Updated GPS on (hdpi and mdpi), text select handles (mdpi), removing unused text_select_handle.png (mdpi)" into gingerbread
Merge commit '
45738f6700cff689eacda7c8192b76939ba20591' into gingerbread-plus-aosp
* commit '
45738f6700cff689eacda7c8192b76939ba20591':
Updated GPS on (hdpi and mdpi), text select handles (mdpi), removing unused text_select_handle.png (mdpi)
Justin Ho [Wed, 13 Oct 2010 00:38:44 +0000 (17:38 -0700)]
Merge "Updated GPS on (hdpi and mdpi), text select handles (mdpi), removing unused text_select_handle.png (mdpi)" into gingerbread
Hung-ying Tyan [Wed, 13 Oct 2010 00:37:38 +0000 (17:37 -0700)]
am
907f6f1d: Merge "Fix SipSessionGroup from throwing ConcurrentModificationException" into gingerbread
Merge commit '
907f6f1d7d13531015b545861b93e1607d253cfd' into gingerbread-plus-aosp
* commit '
907f6f1d7d13531015b545861b93e1607d253cfd':
Fix SipSessionGroup from throwing ConcurrentModificationException
Hung-ying Tyan [Wed, 13 Oct 2010 00:33:27 +0000 (17:33 -0700)]
Merge "Fix SipSessionGroup from throwing ConcurrentModificationException" into gingerbread
Adam Powell [Wed, 13 Oct 2010 00:11:51 +0000 (17:11 -0700)]
am
c417612a: Merge "Fix bug
3083631 - Links no longer get tapped during scale gestures" into gingerbread
Merge commit '
c417612a1abb6281697a9738a1a19eb8814ae8a6' into gingerbread-plus-aosp
* commit '
c417612a1abb6281697a9738a1a19eb8814ae8a6':
Fix bug
3083631 - Links no longer get tapped during scale gestures
Adam Powell [Wed, 13 Oct 2010 00:08:43 +0000 (17:08 -0700)]
Merge "Fix bug
3083631 - Links no longer get tapped during scale gestures" into gingerbread
Jaikumar Ganesh [Tue, 12 Oct 2010 23:50:45 +0000 (16:50 -0700)]
am
1bc3a407: Merge "Fix auto connection priority handling." into gingerbread
Merge commit '
1bc3a407ceb380e35e894f405f544b5b87e980d4' into gingerbread-plus-aosp
* commit '
1bc3a407ceb380e35e894f405f544b5b87e980d4':
Fix auto connection priority handling.
Jaikumar Ganesh [Tue, 12 Oct 2010 23:46:50 +0000 (16:46 -0700)]
Merge "Fix auto connection priority handling." into gingerbread
Jeff Brown [Tue, 12 Oct 2010 23:12:34 +0000 (16:12 -0700)]
am
fa3d9557: Merge "Add text selection handles to preloaded drawables." into gingerbread
Merge commit '
fa3d9557c8178e9c4b9471a76edcf4d48a5b3551' into gingerbread-plus-aosp
* commit '
fa3d9557c8178e9c4b9471a76edcf4d48a5b3551':
Add text selection handles to preloaded drawables.
Jeff Brown [Tue, 12 Oct 2010 23:08:59 +0000 (16:08 -0700)]
Merge "Add text selection handles to preloaded drawables." into gingerbread
Andy Stadler [Tue, 12 Oct 2010 22:25:34 +0000 (15:25 -0700)]
am
8e2be267: Add versionCode and versionName to dumpsys packages
Merge commit '
8e2be267f53bd1d2f1531f56732ead4138ac5c58' into gingerbread-plus-aosp
* commit '
8e2be267f53bd1d2f1531f56732ead4138ac5c58':
Add versionCode and versionName to dumpsys packages
Adam Powell [Tue, 12 Oct 2010 22:03:29 +0000 (15:03 -0700)]
am
fb6431c0: Merge "Fix bug
3064135 - do not allow text handles on TextViews in sub windows." into gingerbread
Merge commit '
fb6431c0298747d240fcdc025575e5f46db95132' into gingerbread-plus-aosp
* commit '
fb6431c0298747d240fcdc025575e5f46db95132':
Fix bug
3064135 - do not allow text handles on TextViews in sub windows.
Adam Powell [Tue, 12 Oct 2010 22:00:30 +0000 (15:00 -0700)]
Merge "Fix bug
3064135 - do not allow text handles on TextViews in sub windows." into gingerbread
Irfan Sheriff [Tue, 12 Oct 2010 21:59:20 +0000 (14:59 -0700)]
am
e22eb863: Merge "fix start driver for corner cases DO NOT MERGE" into gingerbread
Merge commit '
e22eb863dc4419dcaf329e9e28e3dc1f71f82902' into gingerbread-plus-aosp
* commit '
e22eb863dc4419dcaf329e9e28e3dc1f71f82902':
fix start driver for corner cases DO NOT MERGE
Irfan Sheriff [Tue, 12 Oct 2010 21:55:52 +0000 (14:55 -0700)]
Merge "fix start driver for corner cases DO NOT MERGE" into gingerbread
Joe Onorato [Tue, 12 Oct 2010 21:46:23 +0000 (14:46 -0700)]
am
ba799098: Merge changes I76513387,I335fb671 into gingerbread
Merge commit '
ba799098608c7be8ff1e18adfa7dc1f452205a7e' into gingerbread-plus-aosp
* commit '
ba799098608c7be8ff1e18adfa7dc1f452205a7e':
Remove dead code, and make the animation a setting.
turn off the electron beam
Joe Onorato [Tue, 12 Oct 2010 21:43:24 +0000 (14:43 -0700)]
Merge changes I76513387,I335fb671 into gingerbread
* changes:
Remove dead code, and make the animation a setting.
turn off the electron beam
Wink Saville [Tue, 12 Oct 2010 21:21:10 +0000 (14:21 -0700)]
am
a3100314: Merge "Remove some PII." into gingerbread
Merge commit '
a310031438877a7b70a6ac30eb2f2b33e06907e6' into gingerbread-plus-aosp
* commit '
a310031438877a7b70a6ac30eb2f2b33e06907e6':
Remove some PII.
Dirk Dougherty [Tue, 12 Oct 2010 21:18:33 +0000 (14:18 -0700)]
am
354954a0: Merge "Doc change: cherrypick testing changes from Squashed commit of the following:" into gingerbread
Merge commit '
354954a01c533c6789536c141cf330ddf3976e8b' into gingerbread-plus-aosp
* commit '
354954a01c533c6789536c141cf330ddf3976e8b':
Doc change: cherrypick testing changes from master. Squashed commit of the following:
Wink Saville [Tue, 12 Oct 2010 21:17:00 +0000 (14:17 -0700)]
Merge "Remove some PII." into gingerbread
Mathias Agopian [Mon, 11 Oct 2010 19:37:43 +0000 (12:37 -0700)]
turn off the electron beam
Change-Id: I335fb6719f1d5a3f1c6f37a046fd1c2c4ed2bbc6
Dirk Dougherty [Tue, 12 Oct 2010 21:16:05 +0000 (14:16 -0700)]
Merge "Doc change: cherrypick testing changes from Squashed commit of the following:" into gingerbread
John Wang [Tue, 12 Oct 2010 18:55:31 +0000 (11:55 -0700)]
am
844a6b3c: Turn off additional debug.
Merge commit '
844a6b3ccaff1ad1443ad985e4527b733ce97c0e' into gingerbread-plus-aosp
* commit '
844a6b3ccaff1ad1443ad985e4527b733ce97c0e':
Turn off additional debug.
Leon Scroggins [Tue, 12 Oct 2010 18:23:12 +0000 (11:23 -0700)]
am
f348502c: Merge "Allow TextView to do its thing." into gingerbread
Merge commit '
f348502c70ae2f3c90bf75d8c4b4402d5e8e4d59' into gingerbread-plus-aosp
* commit '
f348502c70ae2f3c90bf75d8c4b4402d5e8e4d59':
Allow TextView to do its thing.
Leon Scroggins [Tue, 12 Oct 2010 17:24:48 +0000 (10:24 -0700)]
Merge "Allow TextView to do its thing." into gingerbread
Brad Fitzpatrick [Tue, 12 Oct 2010 15:23:40 +0000 (08:23 -0700)]
am
9facd2d0: Merge "StrictMode: link to designing for responsiveness ANR docs" into gingerbread
Merge commit '
9facd2d0847691ae46108713d6a7dc9f51a62135' into gingerbread-plus-aosp
* commit '
9facd2d0847691ae46108713d6a7dc9f51a62135':
StrictMode: link to designing for responsiveness ANR docs
Brad Fitzpatrick [Tue, 12 Oct 2010 15:09:55 +0000 (08:09 -0700)]
Merge "StrictMode: link to designing for responsiveness ANR docs" into gingerbread
Jeff Brown [Tue, 12 Oct 2010 08:04:16 +0000 (01:04 -0700)]
am
03aa28fb: Merge "Improve the input policy handling a bit." into gingerbread
Merge commit '
03aa28fb36589a3d601be08e75c08a24c4344d6f' into gingerbread-plus-aosp
* commit '
03aa28fb36589a3d601be08e75c08a24c4344d6f':
Improve the input policy handling a bit.
OSDN Git Service
