OSDN Git Service
Hung-ying Tyan [Tue, 7 Sep 2010 03:19:52 +0000 (20:19 -0700)]
am
b6432ca4: am
960b31e3: Merge "SipService: unset session listener if listener is gone." into gingerbread
Merge commit '
b6432ca4a090c02a07038f926e9e514d8cb1b657'
* commit '
b6432ca4a090c02a07038f926e9e514d8cb1b657':
SipService: unset session listener if listener is gone.
Hung-ying Tyan [Tue, 7 Sep 2010 03:16:51 +0000 (20:16 -0700)]
am
960b31e3: Merge "SipService: unset session listener if listener is gone." into gingerbread
Merge commit '
960b31e3b3b40f92665be4b7a79da7f05ea19751' into gingerbread-plus-aosp
* commit '
960b31e3b3b40f92665be4b7a79da7f05ea19751':
SipService: unset session listener if listener is gone.
Hung-ying Tyan [Tue, 7 Sep 2010 03:13:32 +0000 (20:13 -0700)]
Merge "SipService: unset session listener if listener is gone." into gingerbread
Brad Fitzpatrick [Tue, 7 Sep 2010 02:43:44 +0000 (19:43 -0700)]
am
32e29851: am
612ff274: Quell annoying Java ascii/unicode warning.
Merge commit '
32e298511a31160868f7303dbf9a1910099c0b57'
* commit '
32e298511a31160868f7303dbf9a1910099c0b57':
Quell annoying Java ascii/unicode warning.
Brad Fitzpatrick [Tue, 7 Sep 2010 02:34:43 +0000 (19:34 -0700)]
am
612ff274: Quell annoying Java ascii/unicode warning.
Merge commit '
612ff27425cf2976396d992f32b58ab900c7d708' into gingerbread-plus-aosp
* commit '
612ff27425cf2976396d992f32b58ab900c7d708':
Quell annoying Java ascii/unicode warning.
Maksymilian Osowski [Mon, 6 Sep 2010 11:25:15 +0000 (04:25 -0700)]
Merge "Fixed the bug in forwarder that prevented ConnectionHandler threads from exiting."
Chung-yih Wang [Mon, 6 Sep 2010 05:03:42 +0000 (22:03 -0700)]
Chung-yih Wang [Mon, 6 Sep 2010 05:01:38 +0000 (22:01 -0700)]
am
b6264a87: Fix the build.
Merge commit '
b6264a8795ed9469c80727123e3cafda1b07eda3' into gingerbread-plus-aosp
* commit '
b6264a8795ed9469c80727123e3cafda1b07eda3':
Fix the build.
Chung-yih Wang [Mon, 6 Sep 2010 04:16:16 +0000 (21:16 -0700)]
am
2143ade8: am
b12baad9: Add equals() funcation for SipPhone.
Merge commit '
2143ade8030b8765e8744f5ff1ad90343f7fbfcd'
* commit '
2143ade8030b8765e8744f5ff1ad90343f7fbfcd':
Add equals() funcation for SipPhone.
Chung-yih Wang [Mon, 6 Sep 2010 04:12:57 +0000 (21:12 -0700)]
am
b12baad9: Add equals() funcation for SipPhone.
Merge commit '
b12baad9357c6e6aec1f7d84fd041c54fe963407' into gingerbread-plus-aosp
* commit '
b12baad9357c6e6aec1f7d84fd041c54fe963407':
Add equals() funcation for SipPhone.
Jim Miller [Sat, 4 Sep 2010 00:58:31 +0000 (17:58 -0700)]
Merge "Update RecentApplications to use shared Carousel widget."
Romain Guy [Sat, 4 Sep 2010 00:25:02 +0000 (17:25 -0700)]
Merge "Fix the build."
Nipun Kwatra [Sat, 4 Sep 2010 00:14:51 +0000 (17:14 -0700)]
Merge changes I71f5b0fc,I92c7accb
* changes:
Moving decision to use still camera to CameraSourceTimeLapse
pass auxiliary video parameters.
Kenny Root [Sat, 4 Sep 2010 00:10:48 +0000 (17:10 -0700)]
am
a060b5f7: am
6dc003a7: Merge "Reduce footprint of Signature from ~7000 to ~1448" into gingerbread
Merge commit '
a060b5f73863f4b5f161674a9c5ac0a0d8d76072'
* commit '
a060b5f73863f4b5f161674a9c5ac0a0d8d76072':
Reduce footprint of Signature from ~7000 to ~1448
Kenny Root [Sat, 4 Sep 2010 00:07:15 +0000 (17:07 -0700)]
am
6dc003a7: Merge "Reduce footprint of Signature from ~7000 to ~1448" into gingerbread
Merge commit '
6dc003a73f7f01aa5dd5831e777e2aa44f65b032' into gingerbread-plus-aosp
* commit '
6dc003a73f7f01aa5dd5831e777e2aa44f65b032':
Reduce footprint of Signature from ~7000 to ~1448
Kenny Root [Fri, 3 Sep 2010 23:59:42 +0000 (16:59 -0700)]
Merge "Reduce footprint of Signature from ~7000 to ~1448" into gingerbread
Jesse Wilson [Fri, 3 Sep 2010 23:55:24 +0000 (16:55 -0700)]
am
783f14dd: am
3326f804: Fix the last remaining gaps in our Java 6 API.
Merge commit '
783f14ddc9e4032b72aed7880aeb9d39970c98b7'
* commit '
783f14ddc9e4032b72aed7880aeb9d39970c98b7':
Fix the last remaining gaps in our Java 6 API.
Eric Laurent [Fri, 3 Sep 2010 23:52:31 +0000 (16:52 -0700)]
am
ef9e508c: am
7e427934: Merge "LVM release 1.08 delivery." into gingerbread
Merge commit '
ef9e508c2cb3b52d31250ceca3dddace17cec950'
* commit '
ef9e508c2cb3b52d31250ceca3dddace17cec950':
LVM release 1.08 delivery.
Adam Powell [Fri, 3 Sep 2010 23:52:22 +0000 (16:52 -0700)]
am
0354f0ca: (-s ours) am
7627c221: DO NOT MERGE Tweak overscroll
Merge commit '
0354f0cad59fd87a2756d3949213fe54ac2a50f0'
* commit '
0354f0cad59fd87a2756d3949213fe54ac2a50f0':
DO NOT MERGE Tweak overscroll
James Dong [Fri, 3 Sep 2010 23:51:50 +0000 (16:51 -0700)]
am
d6fd133d: am
9077f8ec: Merge "Not all audio source has the drift time information" into gingerbread
Merge commit '
d6fd133d18c189ab112daef9dc649d0796df5d99'
* commit '
d6fd133d18c189ab112daef9dc649d0796df5d99':
Not all audio source has the drift time information
Dianne Hackborn [Fri, 3 Sep 2010 23:51:32 +0000 (16:51 -0700)]
am
acc4e041: (-s ours) am
69717ccd: DO NOT MERGE. Some stuff that is Not Ready.
Merge commit '
acc4e041d27c24b45fb190c493717fda987b52c2'
* commit '
acc4e041d27c24b45fb190c493717fda987b52c2':
DO NOT MERGE. Some stuff that is Not Ready.
Romain Guy [Fri, 3 Sep 2010 23:49:36 +0000 (16:49 -0700)]
Merge "Prevent the system process from using the HardwareRenderer."
Jesse Wilson [Fri, 3 Sep 2010 23:42:51 +0000 (16:42 -0700)]
am
3326f804: Fix the last remaining gaps in our Java 6 API.
Merge commit '
3326f8043858152ea2a407a9a4c20fdcdc859e73' into gingerbread-plus-aosp
* commit '
3326f8043858152ea2a407a9a4c20fdcdc859e73':
Fix the last remaining gaps in our Java 6 API.
Dianne Hackborn [Fri, 3 Sep 2010 23:40:58 +0000 (16:40 -0700)]
resolved conflicts for merge of
6a3ffb5b to master
Change-Id: I3c77887f56c4fdc1cd80682eccc2f5e0020e2761
Eric Laurent [Fri, 3 Sep 2010 23:39:59 +0000 (16:39 -0700)]
am
7e427934: Merge "LVM release 1.08 delivery." into gingerbread
Merge commit '
7e427934e69db804f3ee803e6ffeef4a339e9b8b' into gingerbread-plus-aosp
* commit '
7e427934e69db804f3ee803e6ffeef4a339e9b8b':
LVM release 1.08 delivery.
Eric Laurent [Fri, 3 Sep 2010 23:35:54 +0000 (16:35 -0700)]
Merge "LVM release 1.08 delivery." into gingerbread
Adam Powell [Fri, 3 Sep 2010 23:33:37 +0000 (16:33 -0700)]
am
7627c221: DO NOT MERGE Tweak overscroll
Merge commit '
7627c221c6ce8bf433bf207b002eabe7236c4757' into gingerbread-plus-aosp
* commit '
7627c221c6ce8bf433bf207b002eabe7236c4757':
DO NOT MERGE Tweak overscroll
James Dong [Fri, 3 Sep 2010 22:45:01 +0000 (15:45 -0700)]
am
9077f8ec: Merge "Not all audio source has the drift time information" into gingerbread
Merge commit '
9077f8ec931a4c080948a85ce2e0f793f65e9b62' into gingerbread-plus-aosp
* commit '
9077f8ec931a4c080948a85ce2e0f793f65e9b62':
Not all audio source has the drift time information
James Dong [Fri, 3 Sep 2010 22:42:09 +0000 (15:42 -0700)]
Merge "Not all audio source has the drift time information" into gingerbread
Joe Malin [Fri, 3 Sep 2010 22:30:24 +0000 (15:30 -0700)]
Merge "Doc Change:ActivityManager usage doc:running test package"
Joe Malin [Fri, 3 Sep 2010 22:29:59 +0000 (15:29 -0700)]
Merge "Doc change: Update pm command usage for test packages"
Dianne Hackborn [Fri, 3 Sep 2010 22:23:46 +0000 (15:23 -0700)]
am
69717ccd: DO NOT MERGE. Some stuff that is Not Ready.
Merge commit '
69717ccd13bb5568b912701ab39d603cfa7091cc' into gingerbread-plus-aosp
* commit '
69717ccd13bb5568b912701ab39d603cfa7091cc':
DO NOT MERGE. Some stuff that is Not Ready.
Gloria Wang [Fri, 3 Sep 2010 22:21:50 +0000 (15:21 -0700)]
Merge "Fix for the incorrect size of the new added DRM file. (bug
2897238)"
Dianne Hackborn [Fri, 3 Sep 2010 22:18:39 +0000 (15:18 -0700)]
am
df3a0f50: Merge "Improve doc." into gingerbread
Merge commit '
df3a0f50c3480911e366c8c0781b0463fe063e82' into gingerbread-plus-aosp
* commit '
df3a0f50c3480911e366c8c0781b0463fe063e82':
Improve doc.
Dianne Hackborn [Fri, 3 Sep 2010 22:15:50 +0000 (15:15 -0700)]
Merge "Improve doc." into gingerbread
Dianne Hackborn [Fri, 3 Sep 2010 22:14:57 +0000 (15:14 -0700)]
am
fd3f44b3: am
e1aa82a4: Merge "Adding a feature denoting support for 5 or more fully independent multitouch pointers." into gingerbread
Merge commit '
fd3f44b38882c74c10aff0e238ee4ad9fcd8b724'
* commit '
fd3f44b38882c74c10aff0e238ee4ad9fcd8b724':
Adding a feature denoting support for 5 or more fully
Dianne Hackborn [Fri, 3 Sep 2010 22:10:24 +0000 (15:10 -0700)]
am
e1aa82a4: Merge "Adding a feature denoting support for 5 or more fully independent multitouch pointers." into gingerbread
Merge commit '
e1aa82a4228d009537693253ba3a0113abbf5ab8' into gingerbread-plus-aosp
* commit '
e1aa82a4228d009537693253ba3a0113abbf5ab8':
Adding a feature denoting support for 5 or more fully
Dianne Hackborn [Fri, 3 Sep 2010 22:07:17 +0000 (15:07 -0700)]
Merge "Adding a feature denoting support for 5 or more fully independent multitouch pointers." into gingerbread
Andreas Huber [Fri, 3 Sep 2010 21:54:28 +0000 (14:54 -0700)]
am
8e11c822: am
9fee0b2a: Ogg files can be tagged to be automatically looping, this setting always overrides the MediaPlayer\'s setLooping setting.
Merge commit '
8e11c82247151085fa165c76bfbc157bc6091ca4'
* commit '
8e11c82247151085fa165c76bfbc157bc6091ca4':
Ogg files can be tagged to be automatically looping, this setting always overrides the MediaPlayer's setLooping setting.
Andreas Huber [Fri, 3 Sep 2010 21:50:18 +0000 (14:50 -0700)]
am
9fee0b2a: Ogg files can be tagged to be automatically looping, this setting always overrides the MediaPlayer\'s setLooping setting.
Merge commit '
9fee0b2a02daa6fcf286ed930e45400dd3ba8dba' into gingerbread-plus-aosp
* commit '
9fee0b2a02daa6fcf286ed930e45400dd3ba8dba':
Ogg files can be tagged to be automatically looping, this setting always overrides the MediaPlayer's setLooping setting.
Jamie Gennis [Fri, 3 Sep 2010 21:42:06 +0000 (14:42 -0700)]
Merge "Add the new Stagefright ANativeWindow OMX codec API."
John Wang [Fri, 3 Sep 2010 21:17:20 +0000 (14:17 -0700)]
am
419126a6: am
dc243482: Merge "Add API to get all foreground calls." into gingerbread
Merge commit '
419126a6969be5384742b2fbf5f8507d0513c8db'
* commit '
419126a6969be5384742b2fbf5f8507d0513c8db':
Add API to get all foreground calls.
Adam Powell [Fri, 3 Sep 2010 21:17:16 +0000 (14:17 -0700)]
am
f9a1ff41: (-s ours) am
e7c02ef4: Merge "Fix bug
2973252 - Make overscroll glow respect ifContentScrolls" into gingerbread
Merge commit '
f9a1ff4173fd366fb263f0d3cae71014404c4612'
* commit '
f9a1ff4173fd366fb263f0d3cae71014404c4612':
Fix bug
2973252 - Make overscroll glow respect ifContentScrolls
Andreas Huber [Fri, 3 Sep 2010 21:13:19 +0000 (14:13 -0700)]
am
af7a7c34: am
cc4a38c6: Merge "Properly buffer a certain amount of data on streaming sources before finishing prepare()." into gingerbread
Merge commit '
af7a7c34e0752db2b8ec3dd7fa6e8d486ea010dc'
* commit '
af7a7c34e0752db2b8ec3dd7fa6e8d486ea010dc':
Properly buffer a certain amount of data on streaming sources before finishing prepare().
John Wang [Fri, 3 Sep 2010 21:08:32 +0000 (14:08 -0700)]
am
dc243482: Merge "Add API to get all foreground calls." into gingerbread
Merge commit '
dc243482d6e104c4a3cddaa694c2ee3c628c2c20' into gingerbread-plus-aosp
* commit '
dc243482d6e104c4a3cddaa694c2ee3c628c2c20':
Add API to get all foreground calls.
Dianne Hackborn [Fri, 3 Sep 2010 21:07:25 +0000 (14:07 -0700)]
resolved conflicts for merge of
3d7d3690 to master
Change-Id: I1d1d7a448b3ae8a86600addfa75f2448a98327bf
John Wang [Fri, 3 Sep 2010 21:06:20 +0000 (14:06 -0700)]
Merge "Add API to get all foreground calls." into gingerbread
Adam Powell [Fri, 3 Sep 2010 21:00:41 +0000 (14:00 -0700)]
am
e7c02ef4: Merge "Fix bug
2973252 - Make overscroll glow respect ifContentScrolls" into gingerbread
Merge commit '
e7c02ef40a10c599b13684a6f99a91eabd0f258f' into gingerbread-plus-aosp
* commit '
e7c02ef40a10c599b13684a6f99a91eabd0f258f':
Fix bug
2973252 - Make overscroll glow respect ifContentScrolls
Adam Powell [Fri, 3 Sep 2010 20:58:37 +0000 (13:58 -0700)]
Merge "Fix bug
2973252 - Make overscroll glow respect ifContentScrolls" into gingerbread
Andreas Huber [Fri, 3 Sep 2010 20:48:43 +0000 (13:48 -0700)]
am
cc4a38c6: Merge "Properly buffer a certain amount of data on streaming sources before finishing prepare()." into gingerbread
Merge commit '
cc4a38c60f52082f3c1970c7eda6756949c6e5d5' into gingerbread-plus-aosp
* commit '
cc4a38c60f52082f3c1970c7eda6756949c6e5d5':
Properly buffer a certain amount of data on streaming sources before finishing prepare().
Andreas Huber [Fri, 3 Sep 2010 20:46:02 +0000 (13:46 -0700)]
Merge "Properly buffer a certain amount of data on streaming sources before finishing prepare()." into gingerbread
Scott Main [Fri, 3 Sep 2010 20:28:18 +0000 (13:28 -0700)]
Brad Fitzpatrick [Fri, 3 Sep 2010 20:27:51 +0000 (13:27 -0700)]
am
9eb32c96: am
a2f2141c: Merge "More SharedPreferences commit() -> apply() changes." into gingerbread
Merge commit '
9eb32c96c872512c8aedc8627a4b96e9ea2a1a28'
* commit '
9eb32c96c872512c8aedc8627a4b96e9ea2a1a28':
More SharedPreferences commit() -> apply() changes.
Dianne Hackborn [Fri, 3 Sep 2010 20:26:30 +0000 (13:26 -0700)]
am
e25b4bc7: Merge "These are not ready to be exposed. Also rename them to be better." into gingerbread
Merge commit '
e25b4bc76fef584b38ce4e72f919fba119bdfa99' into gingerbread-plus-aosp
* commit '
e25b4bc76fef584b38ce4e72f919fba119bdfa99':
These are not ready to be exposed. Also rename them to be better.
Jeff Hamilton [Fri, 3 Sep 2010 20:26:23 +0000 (13:26 -0700)]
Merge "Hide this log behind the debug flag."
Dianne Hackborn [Fri, 3 Sep 2010 20:24:33 +0000 (13:24 -0700)]
Merge "These are not ready to be exposed. Also rename them to be better." into gingerbread
Scott Main [Fri, 3 Sep 2010 20:18:28 +0000 (13:18 -0700)]
am
2b136832: am
c4367e54: fix code snippet error
Merge commit '
2b136832be7326caed0c79bae418c2dd54372bea' into gingerbread-plus-aosp
* commit '
2b136832be7326caed0c79bae418c2dd54372bea':
fix code snippet error
Wink Saville [Fri, 3 Sep 2010 20:17:00 +0000 (13:17 -0700)]
Merge "Remove unused intent from filter and unused method."
Scott Main [Fri, 3 Sep 2010 20:15:11 +0000 (13:15 -0700)]
am
c4367e54: fix code snippet error
Merge commit '
c4367e54e41f4e7a6c79b60dd80e66c9e6fdcfc3' into gingerbread
* commit '
c4367e54e41f4e7a6c79b60dd80e66c9e6fdcfc3':
fix code snippet error
Alex Sakhartchouk [Fri, 3 Sep 2010 19:58:28 +0000 (12:58 -0700)]
Merge "Fixing fragment shader bounding code"
Daniel Sandler [Fri, 3 Sep 2010 19:51:36 +0000 (12:51 -0700)]
Merge "Don't get stung!"
Brad Fitzpatrick [Fri, 3 Sep 2010 19:49:44 +0000 (12:49 -0700)]
am
a2f2141c: Merge "More SharedPreferences commit() -> apply() changes." into gingerbread
Merge commit '
a2f2141c84923e34e003bec92b7435ea79b02ee8' into gingerbread-plus-aosp
* commit '
a2f2141c84923e34e003bec92b7435ea79b02ee8':
More SharedPreferences commit() -> apply() changes.
Brad Fitzpatrick [Fri, 3 Sep 2010 19:46:25 +0000 (12:46 -0700)]
Merge "More SharedPreferences commit() -> apply() changes." into gingerbread
Chet Haase [Fri, 3 Sep 2010 19:31:17 +0000 (12:31 -0700)]
Merge "Add transition effects for layout changes on ViewGroups"
Marco Nelissen [Fri, 3 Sep 2010 18:54:31 +0000 (11:54 -0700)]
am
e7884d68: am
d85621c9: Don\'t crash when extra logging is enabled.
Merge commit '
e7884d68a613e579a12a52455f6b5b13a90a0f8a'
* commit '
e7884d68a613e579a12a52455f6b5b13a90a0f8a':
Don't crash when extra logging is enabled.
Marco Nelissen [Fri, 3 Sep 2010 18:51:28 +0000 (11:51 -0700)]
am
d85621c9: Don\'t crash when extra logging is enabled.
Merge commit '
d85621c938286a568b1173e7ab29f80ab93d27e1' into gingerbread-plus-aosp
* commit '
d85621c938286a568b1173e7ab29f80ab93d27e1':
Don't crash when extra logging is enabled.
Daniel Sandler [Fri, 3 Sep 2010 18:41:43 +0000 (11:41 -0700)]
Merge "Fix status bar battery meter."
James Dong [Fri, 3 Sep 2010 18:37:14 +0000 (11:37 -0700)]
am
bc1452a3: am
7755cdd6: Remove unused/debugging code from MP4 file writer
Merge commit '
bc1452a307ac61ca87bf78722701ac85100952af'
* commit '
bc1452a307ac61ca87bf78722701ac85100952af':
Remove unused/debugging code from MP4 file writer
James Dong [Fri, 3 Sep 2010 18:33:47 +0000 (11:33 -0700)]
am
7755cdd6: Remove unused/debugging code from MP4 file writer
Merge commit '
7755cdd69690ccbb42c6fd47b3e9c4594d4ade82' into gingerbread-plus-aosp
* commit '
7755cdd69690ccbb42c6fd47b3e9c4594d4ade82':
Remove unused/debugging code from MP4 file writer
Daniel Sandler [Fri, 3 Sep 2010 17:13:55 +0000 (10:13 -0700)]
Merge "Tweaks to lights out animation."
James Dong [Fri, 3 Sep 2010 16:59:05 +0000 (09:59 -0700)]
am
3c3fc97e: am
46e63b34: Merge "Better file size estimate" into gingerbread
Merge commit '
3c3fc97e104bd17af608727d82e965fc28f2c89d'
* commit '
3c3fc97e104bd17af608727d82e965fc28f2c89d':
Better file size estimate
Kenny Root [Fri, 3 Sep 2010 16:58:51 +0000 (09:58 -0700)]
am
0eec8948: am
305bcbf0: Decrease PackageManagerService wait time for vold
Merge commit '
0eec8948f89c5216464d8204cadd69d7a6ec3669'
* commit '
0eec8948f89c5216464d8204cadd69d7a6ec3669':
Decrease PackageManagerService wait time for vold
James Dong [Fri, 3 Sep 2010 16:55:38 +0000 (09:55 -0700)]
am
46e63b34: Merge "Better file size estimate" into gingerbread
Merge commit '
46e63b346770efa14451b8e67b7f7636c4e5a76c' into gingerbread-plus-aosp
* commit '
46e63b346770efa14451b8e67b7f7636c4e5a76c':
Better file size estimate
Kenny Root [Fri, 3 Sep 2010 16:55:33 +0000 (09:55 -0700)]
am
305bcbf0: Decrease PackageManagerService wait time for vold
Merge commit '
305bcbf0c961840c4505770d084a1caacc074dbb' into gingerbread-plus-aosp
* commit '
305bcbf0c961840c4505770d084a1caacc074dbb':
Decrease PackageManagerService wait time for vold
James Dong [Fri, 3 Sep 2010 16:53:13 +0000 (09:53 -0700)]
Merge "Better file size estimate" into gingerbread
Maksymilian Osowski [Fri, 3 Sep 2010 16:49:51 +0000 (09:49 -0700)]
Merge "Fixed the run_apache2.py script to use the correct mime.types file."
Wink Saville [Fri, 3 Sep 2010 15:16:30 +0000 (08:16 -0700)]
Merge "Fix and simplify ConnectivityService singleton."
Bjorn Bringert [Fri, 3 Sep 2010 09:27:05 +0000 (02:27 -0700)]
Merge "Test for decoding Bitmap from MemoryFile ParcelFileDescriptor"
Kenny Root [Fri, 3 Sep 2010 05:32:39 +0000 (22:32 -0700)]
am
fb79b7da: am
12da9d74: Fix buffer compacting in NativeDaemonConnector
Merge commit '
fb79b7dab3ccaf490e8cbb18c9feed7080e4b54f'
* commit '
fb79b7dab3ccaf490e8cbb18c9feed7080e4b54f':
Fix buffer compacting in NativeDaemonConnector
Kenny Root [Fri, 3 Sep 2010 05:29:05 +0000 (22:29 -0700)]
am
12da9d74: Fix buffer compacting in NativeDaemonConnector
Merge commit '
12da9d7472ae87b841575d5358e19f143d12f900' into gingerbread-plus-aosp
* commit '
12da9d7472ae87b841575d5358e19f143d12f900':
Fix buffer compacting in NativeDaemonConnector
Hung-ying Tyan [Fri, 3 Sep 2010 02:30:16 +0000 (19:30 -0700)]
am
ea16e72b: am
b355714a: Merge "SipManager: always return true for SIP API and VOIP support query." into gingerbread
Merge commit '
ea16e72bff350c0b6e2a00a82b934d1a2fc0fa2d'
* commit '
ea16e72bff350c0b6e2a00a82b934d1a2fc0fa2d':
SipManager: always return true for SIP API and VOIP support query.
Hung-ying Tyan [Fri, 3 Sep 2010 02:26:56 +0000 (19:26 -0700)]
am
b355714a: Merge "SipManager: always return true for SIP API and VOIP support query." into gingerbread
Merge commit '
b355714a2995ebe343808e06f69da5067f52a833' into gingerbread-plus-aosp
* commit '
b355714a2995ebe343808e06f69da5067f52a833':
SipManager: always return true for SIP API and VOIP support query.
Hung-ying Tyan [Fri, 3 Sep 2010 02:23:31 +0000 (19:23 -0700)]
Merge "SipManager: always return true for SIP API and VOIP support query." into gingerbread
Scott Main [Fri, 3 Sep 2010 01:53:32 +0000 (18:53 -0700)]
am
beccf3c4: am
3208557e: am
c5083cdf: Merge "clarify dp dimension description" into froyo
Merge commit '
beccf3c48a6573da6dc0cb3d5e8e170664220f0c'
* commit '
beccf3c48a6573da6dc0cb3d5e8e170664220f0c':
clarify dp dimension description
James Dong [Fri, 3 Sep 2010 01:51:05 +0000 (18:51 -0700)]
am
bb64e554: am
7ed7668b: Merge "Calculate audio media drift time from AudioSource" into gingerbread
Merge commit '
bb64e554d9a28fcf8eebf579e91ff71b8ffef1e3'
* commit '
bb64e554d9a28fcf8eebf579e91ff71b8ffef1e3':
Calculate audio media drift time from AudioSource
Scott Main [Fri, 3 Sep 2010 01:44:11 +0000 (18:44 -0700)]
am
3208557e: am
c5083cdf: Merge "clarify dp dimension description" into froyo
Merge commit '
3208557edca8c133fa32b7718acd22d77f1a9475' into gingerbread-plus-aosp
* commit '
3208557edca8c133fa32b7718acd22d77f1a9475':
clarify dp dimension description
James Dong [Fri, 3 Sep 2010 01:41:49 +0000 (18:41 -0700)]
am
7ed7668b: Merge "Calculate audio media drift time from AudioSource" into gingerbread
Merge commit '
7ed7668b30e70ca8e3f0f183364433326ed29f39' into gingerbread-plus-aosp
* commit '
7ed7668b30e70ca8e3f0f183364433326ed29f39':
Calculate audio media drift time from AudioSource
Scott Main [Fri, 3 Sep 2010 01:30:16 +0000 (18:30 -0700)]
am
c5083cdf: Merge "clarify dp dimension description" into froyo
Merge commit '
c5083cdfff55a8fdcc82198273afd7dbe6379879' into gingerbread
* commit '
c5083cdfff55a8fdcc82198273afd7dbe6379879':
clarify dp dimension description
James Dong [Fri, 3 Sep 2010 01:24:21 +0000 (18:24 -0700)]
Merge "Calculate audio media drift time from AudioSource" into gingerbread
Adam Powell [Fri, 3 Sep 2010 01:12:07 +0000 (18:12 -0700)]
Merge "Make spinnerMode attribute for Spinner widgets public"
Dianne Hackborn [Fri, 3 Sep 2010 00:59:51 +0000 (17:59 -0700)]
am
31103928: am
192b56d4: Merge "Implement #
2964234: Add support for <uses-package> element to aapt" into gingerbread
Merge commit '
31103928ed5b9091bcd7de74c8a49675d10c87e7'
* commit '
31103928ed5b9091bcd7de74c8a49675d10c87e7':
Implement #
2964234: Add support for <uses-package> element to aapt
Scott Main [Fri, 3 Sep 2010 00:53:14 +0000 (17:53 -0700)]
Merge "clarify dp dimension description" into froyo
Dianne Hackborn [Fri, 3 Sep 2010 00:36:37 +0000 (17:36 -0700)]
am
192b56d4: Merge "Implement #
2964234: Add support for <uses-package> element to aapt" into gingerbread
Merge commit '
192b56d42a4f6e5e6c736b0f22dd5bd201b02c9d' into gingerbread-plus-aosp
* commit '
192b56d42a4f6e5e6c736b0f22dd5bd201b02c9d':
Implement #
2964234: Add support for <uses-package> element to aapt
Dianne Hackborn [Fri, 3 Sep 2010 00:34:31 +0000 (17:34 -0700)]
Merge "Implement #
2964234: Add support for <uses-package> element to aapt" into gingerbread
Adam Powell [Fri, 3 Sep 2010 00:19:44 +0000 (17:19 -0700)]
Adam Powell [Thu, 2 Sep 2010 23:00:41 +0000 (16:00 -0700)]
Merge "Fix bug
2957414 - Add Spinner constructor for selecting dialog/dropdown mode"
Kenny Root [Thu, 2 Sep 2010 22:53:26 +0000 (15:53 -0700)]
am
8d5250c6: am
2e246549: Merge "Add better debug output for ResourceType errors" into gingerbread
Merge commit '
8d5250c601504da7a7fde3a3fd7b1c51335becdf'
* commit '
8d5250c601504da7a7fde3a3fd7b1c51335becdf':
Add better debug output for ResourceType errors
Kenny Root [Thu, 2 Sep 2010 22:48:49 +0000 (15:48 -0700)]
am
2e246549: Merge "Add better debug output for ResourceType errors" into gingerbread
Merge commit '
2e2465497c08061cccf4908e49095f2d19a35eea' into gingerbread-plus-aosp
* commit '
2e2465497c08061cccf4908e49095f2d19a35eea':
Add better debug output for ResourceType errors
Kenny Root [Thu, 2 Sep 2010 22:45:52 +0000 (15:45 -0700)]
Merge "Add better debug output for ResourceType errors" into gingerbread
Gilles Debunne [Thu, 2 Sep 2010 22:39:55 +0000 (15:39 -0700)]
am
ece9e194: am
d180232e: Merge "Revert "Merge "InputMethodManager showSoftInput return documentation." into gingerbread"" into gingerbread
Merge commit '
ece9e1947831a46b5d67b1a3d3d8e0189e38d983'
* commit '
ece9e1947831a46b5d67b1a3d3d8e0189e38d983':
Revert "Merge "InputMethodManager showSoftInput return documentation." into gingerbread"
OSDN Git Service
