OSDN Git Service
Gilles Debunne [Wed, 8 Sep 2010 02:05:18 +0000 (19:05 -0700)]
am
cf86bc1d: am
883bbb72: Merge "Hide mCursorController field in ArrowKeyMovementMethod." into gingerbread
Merge commit '
cf86bc1d92128455c06ed8b0a338e7b3145d11a7'
* commit '
cf86bc1d92128455c06ed8b0a338e7b3145d11a7':
Hide mCursorController field in ArrowKeyMovementMethod.
Gilles Debunne [Wed, 8 Sep 2010 02:05:11 +0000 (19:05 -0700)]
am
2ae3718b: (-s ours) am
dbd25cdb: Made text selection work in ExtractEditText. DO NOT MERGE
Merge commit '
2ae3718b448cdc5e94b4686795301a01f54640e4'
* commit '
2ae3718b448cdc5e94b4686795301a01f54640e4':
Made text selection work in ExtractEditText. DO NOT MERGE
Gilles Debunne [Wed, 8 Sep 2010 01:59:22 +0000 (18:59 -0700)]
am
883bbb72: Merge "Hide mCursorController field in ArrowKeyMovementMethod." into gingerbread
Merge commit '
883bbb72284736b5601f9e96d1116969c51b75de' into gingerbread-plus-aosp
* commit '
883bbb72284736b5601f9e96d1116969c51b75de':
Hide mCursorController field in ArrowKeyMovementMethod.
Gilles Debunne [Wed, 8 Sep 2010 01:59:10 +0000 (18:59 -0700)]
am
dbd25cdb: Made text selection work in ExtractEditText. DO NOT MERGE
Merge commit '
dbd25cdbc3dcad573aaeaf493bc186006bce3d8e' into gingerbread-plus-aosp
* commit '
dbd25cdbc3dcad573aaeaf493bc186006bce3d8e':
Made text selection work in ExtractEditText. DO NOT MERGE
Gilles Debunne [Wed, 8 Sep 2010 01:53:55 +0000 (18:53 -0700)]
Merge "Hide mCursorController field in ArrowKeyMovementMethod." into gingerbread
Dmitry Shmidt [Wed, 8 Sep 2010 01:52:40 +0000 (18:52 -0700)]
am
59a5d2d5: (-s ours) am
d0f74ae0: Merge "Rename SETSUSPEND to SETSUSPENDOPT DO NOT MERGE" into gingerbread
Merge commit '
59a5d2d5772f41578c72f48df08c0af918b6519c'
* commit '
59a5d2d5772f41578c72f48df08c0af918b6519c':
Rename SETSUSPEND to SETSUSPENDOPT DO NOT MERGE
Wei-Ta Chen [Wed, 8 Sep 2010 01:52:21 +0000 (18:52 -0700)]
am
a295a390: am
b356f8ac: Merge "Rename LargeBitmap to BitmapRegionDecoder for having a better API." into gingerbread
Merge commit '
a295a3908befeb9dd30203c612d95411d68492ed'
* commit '
a295a3908befeb9dd30203c612d95411d68492ed':
Rename LargeBitmap to BitmapRegionDecoder for having a better API.
Dianne Hackborn [Wed, 8 Sep 2010 01:52:06 +0000 (18:52 -0700)]
am
a1205f07: am
2d3739d4: Merge "Modify native ALooper to take an explicit ident." into gingerbread
Merge commit '
a1205f07a6f0c745e8f42f16fe38c06af04143c7'
* commit '
a1205f07a6f0c745e8f42f16fe38c06af04143c7':
Modify native ALooper to take an explicit ident.
Kenny Root [Wed, 8 Sep 2010 01:51:53 +0000 (18:51 -0700)]
am
000ef46f: am
25429378: Merge "Allow installd to handle large partitions" into gingerbread
Merge commit '
000ef46f5b0f84d08342711b00e8de560ea504af'
* commit '
000ef46f5b0f84d08342711b00e8de560ea504af':
Allow installd to handle large partitions
Elliott Hughes [Wed, 8 Sep 2010 01:51:16 +0000 (18:51 -0700)]
Ying Wang [Wed, 8 Sep 2010 01:39:03 +0000 (18:39 -0700)]
Merge commit '
d348ea6e0ad3fc029a01c214da4ad4b8d856c4f9' into manual-merge
Conflicts:
core/res/res/values/public.xml
Change-Id: Id80cc50b669d7ea840d28839431126023980e5a1
Dmitry Shmidt [Wed, 8 Sep 2010 00:33:55 +0000 (17:33 -0700)]
am
d0f74ae0: Merge "Rename SETSUSPEND to SETSUSPENDOPT DO NOT MERGE" into gingerbread
Merge commit '
d0f74ae081bac9a9c8f7faf9288305647735d743' into gingerbread-plus-aosp
* commit '
d0f74ae081bac9a9c8f7faf9288305647735d743':
Rename SETSUSPEND to SETSUSPENDOPT DO NOT MERGE
Dmitry Shmidt [Wed, 8 Sep 2010 00:29:45 +0000 (17:29 -0700)]
Merge "Rename SETSUSPEND to SETSUSPENDOPT DO NOT MERGE" into gingerbread
Romain Guy [Wed, 8 Sep 2010 00:17:12 +0000 (17:17 -0700)]
Merge "Correctly set the viewport on window resize."
Wei-Ta Chen [Wed, 8 Sep 2010 00:07:12 +0000 (17:07 -0700)]
am
b356f8ac: Merge "Rename LargeBitmap to BitmapRegionDecoder for having a better API." into gingerbread
Merge commit '
b356f8acec9fdfd36f01e5cca4fe3a28ecd6e628' into gingerbread-plus-aosp
* commit '
b356f8acec9fdfd36f01e5cca4fe3a28ecd6e628':
Rename LargeBitmap to BitmapRegionDecoder for having a better API.
Wei-Ta Chen [Wed, 8 Sep 2010 00:01:57 +0000 (17:01 -0700)]
Merge "Rename LargeBitmap to BitmapRegionDecoder for having a better API." into gingerbread
Dianne Hackborn [Tue, 7 Sep 2010 23:38:45 +0000 (16:38 -0700)]
am
2d3739d4: Merge "Modify native ALooper to take an explicit ident." into gingerbread
Merge commit '
2d3739d479d67ba736cefbdd6087a11eadfb14ea' into gingerbread-plus-aosp
* commit '
2d3739d479d67ba736cefbdd6087a11eadfb14ea':
Modify native ALooper to take an explicit ident.
Dianne Hackborn [Tue, 7 Sep 2010 23:32:48 +0000 (16:32 -0700)]
Merge "Modify native ALooper to take an explicit ident." into gingerbread
Makoto Onuki [Tue, 7 Sep 2010 22:59:07 +0000 (15:59 -0700)]
Merge "Add getApplicationContext to the mock implementation."
Dianne Hackborn [Tue, 7 Sep 2010 22:28:30 +0000 (15:28 -0700)]
Modify native ALooper to take an explicit ident.
The ALooper API now uses an explicit "identifier" for the integer
that is returned rather than implicitly using the fd. This allows
the APIs that had the fd to be a little more sane.
Change-Id: I8507f535ad484c0bdc4a1bd016d87bb09acd7ff0
Kenny Root [Tue, 7 Sep 2010 22:42:02 +0000 (15:42 -0700)]
am
25429378: Merge "Allow installd to handle large partitions" into gingerbread
Merge commit '
254293782a94652fd601d6b3f04ad447c072f714' into gingerbread-plus-aosp
* commit '
254293782a94652fd601d6b3f04ad447c072f714':
Allow installd to handle large partitions
Kenny Root [Tue, 7 Sep 2010 22:38:31 +0000 (15:38 -0700)]
Merge "Allow installd to handle large partitions" into gingerbread
Makoto Onuki [Tue, 7 Sep 2010 22:16:44 +0000 (15:16 -0700)]
am
3f6e4d56: am
1cc86da6: Merge "Don\'t fall through from TOKEN_EMAIL_LOOKUP" into gingerbread
Merge commit '
3f6e4d56bba393ac556a672202e00bc417784ce8'
* commit '
3f6e4d56bba393ac556a672202e00bc417784ce8':
Don't fall through from TOKEN_EMAIL_LOOKUP
Dianne Hackborn [Tue, 7 Sep 2010 22:16:38 +0000 (15:16 -0700)]
am
75f0024c: am
6e86915e: Merge "Fixes to battery stats debug output." into gingerbread
Merge commit '
75f0024cf40eadb2cdaa6ae53409c515b68f21c1'
* commit '
75f0024cf40eadb2cdaa6ae53409c515b68f21c1':
Fixes to battery stats debug output.
Dianne Hackborn [Tue, 7 Sep 2010 21:48:28 +0000 (14:48 -0700)]
Dianne Hackborn [Tue, 7 Sep 2010 21:47:51 +0000 (14:47 -0700)]
am
b8bcfed5: am
f703b77c: Merge "Add system property to turn off scheduling groups." into gingerbread
Merge commit '
b8bcfed5524a37ee51e3f1129f1df91bc4a59cb4'
* commit '
b8bcfed5524a37ee51e3f1129f1df91bc4a59cb4':
Add system property to turn off scheduling groups.
Elliott Hughes [Tue, 7 Sep 2010 21:46:15 +0000 (14:46 -0700)]
am
45cda90b: Merge "Be brief." into gingerbread
Merge commit '
45cda90bdc178e253049c7067c78bf4b1204ba82' into gingerbread-plus-aosp
* commit '
45cda90bdc178e253049c7067c78bf4b1204ba82':
Be brief.
Joe Onorato [Tue, 7 Sep 2010 21:46:08 +0000 (14:46 -0700)]
am
1f6a21c2: Merge "Expose the TextAppearance.StatusBar.* styles." into gingerbread
Merge commit '
1f6a21c2377f33a754222a34fa98ea1e21a6d27d' into gingerbread-plus-aosp
* commit '
1f6a21c2377f33a754222a34fa98ea1e21a6d27d':
Expose the TextAppearance.StatusBar.* styles.
Elliott Hughes [Tue, 7 Sep 2010 21:41:36 +0000 (14:41 -0700)]
Merge "Be brief." into gingerbread
Joe Onorato [Tue, 7 Sep 2010 21:41:12 +0000 (14:41 -0700)]
Merge "Expose the TextAppearance.StatusBar.* styles." into gingerbread
Makoto Onuki [Tue, 7 Sep 2010 21:34:19 +0000 (14:34 -0700)]
am
1cc86da6: Merge "Don\'t fall through from TOKEN_EMAIL_LOOKUP" into gingerbread
Merge commit '
1cc86da61a361c84ef81e893440c500e33fae312' into gingerbread-plus-aosp
* commit '
1cc86da61a361c84ef81e893440c500e33fae312':
Don't fall through from TOKEN_EMAIL_LOOKUP
Makoto Onuki [Tue, 7 Sep 2010 21:31:34 +0000 (14:31 -0700)]
Merge "Don't fall through from TOKEN_EMAIL_LOOKUP" into gingerbread
Andreas Huber [Tue, 7 Sep 2010 21:17:49 +0000 (14:17 -0700)]
Merge "Don't assert on unexpected surface flinger dequeue/enqueueBuffer errors, log a warning and ignore them instead."
Dianne Hackborn [Tue, 7 Sep 2010 21:15:17 +0000 (14:15 -0700)]
am
6e86915e: Merge "Fixes to battery stats debug output." into gingerbread
Merge commit '
6e86915e8f5dfffa60ae5d1a4ca9aa74912fd026' into gingerbread-plus-aosp
* commit '
6e86915e8f5dfffa60ae5d1a4ca9aa74912fd026':
Fixes to battery stats debug output.
Dianne Hackborn [Tue, 7 Sep 2010 21:10:38 +0000 (14:10 -0700)]
Merge "Fixes to battery stats debug output." into gingerbread
Vasu Nori [Tue, 7 Sep 2010 20:23:28 +0000 (13:23 -0700)]
Merge "android change to handle Change-Id: Idbeed81b5b7349059e467b33a8641abf0b4aaeff"
Romain Guy [Tue, 7 Sep 2010 19:42:43 +0000 (12:42 -0700)]
Merge "Use static final debug fields."
Dianne Hackborn [Tue, 7 Sep 2010 19:36:33 +0000 (12:36 -0700)]
am
11bbe200: Hopefully fix the build.
Merge commit '
11bbe200cba150cfa5593bb87b54f3072a5ab2c5' into gingerbread-plus-aosp
* commit '
11bbe200cba150cfa5593bb87b54f3072a5ab2c5':
Hopefully fix the build.
Adam Cohen [Tue, 7 Sep 2010 19:32:45 +0000 (12:32 -0700)]
Merge "-> Implemented new visualization for StackView -> Cleaning up the method for creating the blue outline -> Reimplmented onMeasure for StackView and AdapterViewAnimator"
Dianne Hackborn [Tue, 7 Sep 2010 19:32:19 +0000 (12:32 -0700)]
Hopefully fix the build.
Change-Id: Id8cd92c0895c9939e1386ef488bd1309a3be3568
Alex Sakhartchouk [Tue, 7 Sep 2010 19:13:15 +0000 (12:13 -0700)]
Merge "Fixing a3d files to reflect the new element structure."
Alex Sakhartchouk [Tue, 7 Sep 2010 19:13:07 +0000 (12:13 -0700)]
Merge "Add arrays to elements."
Romain Guy [Tue, 7 Sep 2010 19:02:38 +0000 (12:02 -0700)]
Merge "Temporarily disable fading edges if solidColor=0 and hw is on."
Joe Onorato [Tue, 7 Sep 2010 18:54:27 +0000 (11:54 -0700)]
Merge "resolved conflicts for merge of
07990cf2 to master"
Joe Onorato [Tue, 7 Sep 2010 18:53:46 +0000 (14:53 -0400)]
resolved conflicts for merge of
07990cf2 to master
Change-Id: I62cc2d14820e4cbe80ea433caf323be2df1fb9a8
Michael Kolb [Tue, 7 Sep 2010 18:50:54 +0000 (11:50 -0700)]
Merge "Add setting for on screen zoom buttons enables to use pinch to zoom without showing the on screen buttons"
Dianne Hackborn [Tue, 7 Sep 2010 18:30:08 +0000 (11:30 -0700)]
am
f703b77c: Merge "Add system property to turn off scheduling groups." into gingerbread
Merge commit '
f703b77c96a6d133fda534158eaf6190ff7c87f7' into gingerbread-plus-aosp
* commit '
f703b77c96a6d133fda534158eaf6190ff7c87f7':
Add system property to turn off scheduling groups.
Dianne Hackborn [Tue, 7 Sep 2010 18:27:26 +0000 (11:27 -0700)]
Merge "Add system property to turn off scheduling groups." into gingerbread
Dianne Hackborn [Sat, 4 Sep 2010 00:07:07 +0000 (17:07 -0700)]
Add system property to turn off scheduling groups.
Do this:
adb shell setprop debug.sys.noschedgroups 1
Change-Id: I6e06a74205fd45ee1526ce71fe33944465d39984
Joe Onorato [Tue, 7 Sep 2010 18:18:46 +0000 (11:18 -0700)]
am
1f689f7e: Merge "When notifications are updated, don\'t re-show the ticker unless the text has changed." into gingerbread
Merge commit '
1f689f7e35464b1ccd3ce3307b6d92283ee1290d' into gingerbread-plus-aosp
* commit '
1f689f7e35464b1ccd3ce3307b6d92283ee1290d':
When notifications are updated, don't re-show the ticker unless the text has changed.
Brad Fitzpatrick [Tue, 7 Sep 2010 18:18:39 +0000 (11:18 -0700)]
am
c19c9e4e: am
b1104b37: Merge "Make SharedPreferencesBackupHelper wait for async SharedPreference writes" into gingerbread
Merge commit '
c19c9e4ee20512ba29e6e54aee06aa16413901f1'
* commit '
c19c9e4ee20512ba29e6e54aee06aa16413901f1':
Make SharedPreferencesBackupHelper wait for async SharedPreference writes
Brad Fitzpatrick [Tue, 7 Sep 2010 18:15:01 +0000 (11:15 -0700)]
am
b1104b37: Merge "Make SharedPreferencesBackupHelper wait for async SharedPreference writes" into gingerbread
Merge commit '
b1104b3713febb75164938a465c3022e1879245f' into gingerbread-plus-aosp
* commit '
b1104b3713febb75164938a465c3022e1879245f':
Make SharedPreferencesBackupHelper wait for async SharedPreference writes
Joe Onorato [Tue, 7 Sep 2010 18:14:56 +0000 (11:14 -0700)]
Merge "When notifications are updated, don't re-show the ticker unless the text has changed." into gingerbread
Eric Fischer [Tue, 7 Sep 2010 18:14:28 +0000 (11:14 -0700)]
am
aab73757: (-s ours) am
745e751b: Merge "Preserve old translations for changed strings. DO NOT MERGE" into gingerbread
Merge commit '
aab7375799e76ec2e429fbd8224d0c6e8cc96463'
* commit '
aab7375799e76ec2e429fbd8224d0c6e8cc96463':
Preserve old translations for changed strings. DO NOT MERGE
Brad Fitzpatrick [Tue, 7 Sep 2010 18:12:51 +0000 (11:12 -0700)]
Merge "Make SharedPreferencesBackupHelper wait for async SharedPreference writes" into gingerbread
Eric Fischer [Tue, 7 Sep 2010 18:08:19 +0000 (11:08 -0700)]
am
745e751b: Merge "Preserve old translations for changed strings. DO NOT MERGE" into gingerbread
Merge commit '
745e751b251baa38e94dfce1fe264574d0204cc2' into gingerbread-plus-aosp
* commit '
745e751b251baa38e94dfce1fe264574d0204cc2':
Preserve old translations for changed strings. DO NOT MERGE
Eric Fischer [Tue, 7 Sep 2010 18:03:26 +0000 (11:03 -0700)]
Merge "Preserve old translations for changed strings. DO NOT MERGE" into gingerbread
Steve Block [Tue, 7 Sep 2010 17:59:18 +0000 (10:59 -0700)]
Merge "Adds a test case for WebAddress where the path component does not have a leading slash"
Kenny Root [Tue, 7 Sep 2010 17:52:13 +0000 (10:52 -0700)]
am
f17bd19a: am
2cb3e836: Merge "Use new nativeLibraryPath field for NativeActivity" into gingerbread
Merge commit '
f17bd19acbb88429b50a1497bfec0752b456d5c6'
* commit '
f17bd19acbb88429b50a1497bfec0752b456d5c6':
Use new nativeLibraryPath field for NativeActivity
Kenny Root [Tue, 7 Sep 2010 17:49:22 +0000 (10:49 -0700)]
am
2cb3e836: Merge "Use new nativeLibraryPath field for NativeActivity" into gingerbread
Merge commit '
2cb3e83654c99e202c170d9d0237d8d1f4054354' into gingerbread-plus-aosp
* commit '
2cb3e83654c99e202c170d9d0237d8d1f4054354':
Use new nativeLibraryPath field for NativeActivity
Kenny Root [Tue, 7 Sep 2010 17:46:14 +0000 (10:46 -0700)]
Merge "Use new nativeLibraryPath field for NativeActivity" into gingerbread
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.
OSDN Git Service
