OSDN Git Service
Robert Greenwalt [Thu, 9 Sep 2010 20:37:42 +0000 (13:37 -0700)]
Merge "resolved conflicts for merge of
ec52c98d to master"
Christopher Tate [Thu, 9 Sep 2010 20:36:04 +0000 (13:36 -0700)]
Merge "Mute some spammy log messages from KeyButtonView"
Robert Greenwalt [Thu, 9 Sep 2010 20:15:32 +0000 (13:15 -0700)]
resolved conflicts for merge of
ec52c98d to master
Change-Id: I31297232c9d918a967b93c3ae977f81b6a94f2ed
Mike Lockwood [Thu, 9 Sep 2010 20:03:11 +0000 (13:03 -0700)]
Merge "MTP: Fix support for transfering folders and playlists."
Erik Gilling [Thu, 9 Sep 2010 20:01:27 +0000 (13:01 -0700)]
Merge "surfaceflinger: give hwcomposer a chance to release buffers"
Erik Gilling [Thu, 9 Sep 2010 20:01:23 +0000 (13:01 -0700)]
Merge "surfaceflinger: composite HWC_SKIP_LAYER layers"
Erik Gilling [Thu, 9 Sep 2010 20:01:18 +0000 (13:01 -0700)]
Merge "surfaceflinger: unlock clients only after flip"
Adam Powell [Thu, 9 Sep 2010 19:26:16 +0000 (12:26 -0700)]
Merge "Fix bug
2988160 - Flinging broken in certain apps/widgets"
Antti Hatala [Thu, 9 Sep 2010 09:33:05 +0000 (02:33 -0700)]
surfaceflinger: give hwcomposer a chance to release buffers
Change-Id: I605fa779702022865dd58df3b36f37c2644ade36
Antti Hatala [Thu, 9 Sep 2010 09:32:30 +0000 (02:32 -0700)]
surfaceflinger: composite HWC_SKIP_LAYER layers
Change-Id: I363ede63287ae903d66d0d419343f4ecd81bcc00
Antti Hatala [Wed, 8 Sep 2010 13:37:14 +0000 (06:37 -0700)]
surfaceflinger: unlock clients only after flip
Change-Id: I039291a36f05bbaa02b29325d4012114abd784b9
Gilles Debunne [Thu, 9 Sep 2010 18:56:11 +0000 (11:56 -0700)]
Merge "Progress Dialog documentation example uses onPrepareDialog"
Romain Guy [Thu, 9 Sep 2010 18:52:02 +0000 (11:52 -0700)]
Merge "Do not convert 8888 bitmaps to 565 when doing a copy."
Gilles Debunne [Thu, 9 Sep 2010 17:51:57 +0000 (10:51 -0700)]
Merge "Smart word detection in text selection. Manual merge in HC of 63569."
Romain Guy [Thu, 9 Sep 2010 17:14:33 +0000 (10:14 -0700)]
Merge "A Path can exist in several cache entries."
Robert Greenwalt [Thu, 9 Sep 2010 16:49:15 +0000 (09:49 -0700)]
am
0727a865: Merge "Add network condition reporting." into gingerbread
Merge commit '
0727a865d83b944c2fecc0bf1228a36976fe5300' into gingerbread-plus-aosp
* commit '
0727a865d83b944c2fecc0bf1228a36976fe5300':
Add network condition reporting.
Robert Greenwalt [Thu, 9 Sep 2010 16:41:05 +0000 (09:41 -0700)]
Merge "Add network condition reporting." into gingerbread
Mike Lockwood [Thu, 9 Sep 2010 15:28:53 +0000 (08:28 -0700)]
Merge "Add framework resource to specify case sensitivity of the external storage filesystem"
Chia-chi Yeh [Thu, 9 Sep 2010 09:44:04 +0000 (02:44 -0700)]
am
c2eff4a7: am
f6936a3a: Merge "RTP: prevent buffer overflow in AudioRecord." into gingerbread
Merge commit '
c2eff4a71bd3ab75983ffd029123f10bc177d32a'
* commit '
c2eff4a71bd3ab75983ffd029123f10bc177d32a':
RTP: prevent buffer overflow in AudioRecord.
Chia-chi Yeh [Thu, 9 Sep 2010 09:39:58 +0000 (02:39 -0700)]
am
f6936a3a: Merge "RTP: prevent buffer overflow in AudioRecord." into gingerbread
Merge commit '
f6936a3a52b6bb6de27f75d4e38d116e896b7f4d' into gingerbread-plus-aosp
* commit '
f6936a3a52b6bb6de27f75d4e38d116e896b7f4d':
RTP: prevent buffer overflow in AudioRecord.
Chia-chi Yeh [Thu, 9 Sep 2010 09:37:07 +0000 (02:37 -0700)]
Merge "RTP: prevent buffer overflow in AudioRecord." into gingerbread
Chung-yih Wang [Thu, 9 Sep 2010 05:47:30 +0000 (22:47 -0700)]
am
b2118252: am
4d1e0121: Change the keep-alive interval to 10 seconds.
Merge commit '
b2118252545f4b3ab43ffb2cda4b956f8f85ff69'
* commit '
b2118252545f4b3ab43ffb2cda4b956f8f85ff69':
Change the keep-alive interval to 10 seconds.
Chung-yih Wang [Thu, 9 Sep 2010 05:42:52 +0000 (22:42 -0700)]
am
4d1e0121: Change the keep-alive interval to 10 seconds.
Merge commit '
4d1e0121277b566b5e1c22e790a3b607b75d945d' into gingerbread-plus-aosp
* commit '
4d1e0121277b566b5e1c22e790a3b607b75d945d':
Change the keep-alive interval to 10 seconds.
Neal Nguyen [Thu, 9 Sep 2010 03:26:50 +0000 (20:26 -0700)]
am
0c592acf: Merge "Adding Download Manager Integration, stress, and hosts-based tests." into gingerbread-plus-aosp
Merge commit '
0c592acfc0ea298a0cf6c049cce4c5c10974e911'
* commit '
0c592acfc0ea298a0cf6c049cce4c5c10974e911':
Adding Download Manager Integration, stress, and hosts-based tests.
Neal Nguyen [Thu, 9 Sep 2010 03:23:43 +0000 (20:23 -0700)]
Merge "Adding Download Manager Integration, stress, and hosts-based tests." into gingerbread-plus-aosp
Mathias Agopian [Thu, 9 Sep 2010 02:04:07 +0000 (19:04 -0700)]
am
099aa9a1: am
edbb8083: Merge "add a fps counter to sanangeles demo" into gingerbread
Merge commit '
099aa9a1b4eaf6536decbcafac43476c4908ef24'
* commit '
099aa9a1b4eaf6536decbcafac43476c4908ef24':
add a fps counter to sanangeles demo
Mathias Agopian [Thu, 9 Sep 2010 02:01:37 +0000 (19:01 -0700)]
am
edbb8083: Merge "add a fps counter to sanangeles demo" into gingerbread
Merge commit '
edbb8083a815e9d911f8e659fc5c293543fdf502' into gingerbread-plus-aosp
* commit '
edbb8083a815e9d911f8e659fc5c293543fdf502':
add a fps counter to sanangeles demo
Mathias Agopian [Thu, 9 Sep 2010 01:57:42 +0000 (18:57 -0700)]
Merge "add a fps counter to sanangeles demo" into gingerbread
Mathias Agopian [Thu, 9 Sep 2010 01:55:42 +0000 (18:55 -0700)]
add a fps counter to sanangeles demo
Change-Id: I9a9473ce213301cc7661fddfb1ef5a6ffcb346d4
Dirk Dougherty [Thu, 9 Sep 2010 01:22:33 +0000 (18:22 -0700)]
am
eed5d17d: am
ea68cab8: am
3eb07ea4: Merge "Doc change: Add notes for SDK Tools r7 and ADT 0.9.8." into froyo
Merge commit '
eed5d17d7869e77495b9836118a4ffbd5c3ebf50'
* commit '
eed5d17d7869e77495b9836118a4ffbd5c3ebf50':
Doc change: Add notes for SDK Tools r7 and ADT 0.9.8.
Dirk Dougherty [Thu, 9 Sep 2010 01:14:04 +0000 (18:14 -0700)]
am
ea68cab8: am
3eb07ea4: Merge "Doc change: Add notes for SDK Tools r7 and ADT 0.9.8." into froyo
Merge commit '
ea68cab8a33d3169de33c7112000cd3dae233afe' into gingerbread-plus-aosp
* commit '
ea68cab8a33d3169de33c7112000cd3dae233afe':
Doc change: Add notes for SDK Tools r7 and ADT 0.9.8.
Romain Guy [Thu, 9 Sep 2010 01:06:11 +0000 (18:06 -0700)]
Merge "Purge Skia objects from GL caches as needed."
Dirk Dougherty [Thu, 9 Sep 2010 01:05:58 +0000 (18:05 -0700)]
am
3eb07ea4: Merge "Doc change: Add notes for SDK Tools r7 and ADT 0.9.8." into froyo
Merge commit '
3eb07ea483225974484c018d7d5affbf4815ceb2' into gingerbread
* commit '
3eb07ea483225974484c018d7d5affbf4815ceb2':
Doc change: Add notes for SDK Tools r7 and ADT 0.9.8.
Romain Guy [Thu, 9 Sep 2010 01:04:33 +0000 (18:04 -0700)]
Purge Skia objects from GL caches as needed.
Change-Id: I754c671cf790ad5ae8bf047ad328034217da4ecc
James Dong [Thu, 9 Sep 2010 00:57:56 +0000 (17:57 -0700)]
am
306cd58d: am
d353c840: Merge "HW audio encoder expects timestamp via kKeyTime from each input buffer" into gingerbread
Merge commit '
306cd58ddcc0cb8487bc6e015f8c692eea47a334'
* commit '
306cd58ddcc0cb8487bc6e015f8c692eea47a334':
HW audio encoder expects timestamp via kKeyTime from each input buffer
James Dong [Thu, 9 Sep 2010 00:54:28 +0000 (17:54 -0700)]
am
d353c840: Merge "HW audio encoder expects timestamp via kKeyTime from each input buffer" into gingerbread
Merge commit '
d353c840ad5bf1b4e6bfba0e10bcdc79223bcdf7' into gingerbread-plus-aosp
* commit '
d353c840ad5bf1b4e6bfba0e10bcdc79223bcdf7':
HW audio encoder expects timestamp via kKeyTime from each input buffer
Dirk Dougherty [Thu, 9 Sep 2010 00:52:45 +0000 (17:52 -0700)]
Merge "Doc change: Add notes for SDK Tools r7 and ADT 0.9.8." into froyo
James Dong [Thu, 9 Sep 2010 00:51:59 +0000 (17:51 -0700)]
Merge "HW audio encoder expects timestamp via kKeyTime from each input buffer" into gingerbread
Mike LeBeau [Thu, 9 Sep 2010 00:49:34 +0000 (17:49 -0700)]
am
573c5d5e: am
46b84d5b: Merge "Add MediaStore.ACTION_MEDIA_PLAY_FROM_SEARCH intent for open-ended search and play of music. This is used, for instance, by Google\'s new "listen to" Voice Action." into gingerbread
Merge commit '
573c5d5edc1f51fd026e1d0e17ab883403eeddd9'
* commit '
573c5d5edc1f51fd026e1d0e17ab883403eeddd9':
Add MediaStore.ACTION_MEDIA_PLAY_FROM_SEARCH intent for open-ended
Mike LeBeau [Thu, 9 Sep 2010 00:46:22 +0000 (17:46 -0700)]
am
46b84d5b: Merge "Add MediaStore.ACTION_MEDIA_PLAY_FROM_SEARCH intent for open-ended search and play of music. This is used, for instance, by Google\'s new "listen to" Voice Action." into gingerbread
Merge commit '
46b84d5b4a44dbab8e0f6ee11f3ab42e11ce97bb' into gingerbread-plus-aosp
* commit '
46b84d5b4a44dbab8e0f6ee11f3ab42e11ce97bb':
Add MediaStore.ACTION_MEDIA_PLAY_FROM_SEARCH intent for open-ended
Chet Haase [Thu, 9 Sep 2010 00:44:39 +0000 (17:44 -0700)]
Merge "Fix bug with LayoutTransition when layouts are just coming on line"
Adam Cohen [Thu, 9 Sep 2010 00:43:17 +0000 (17:43 -0700)]
Merge "AdapterViewAnimator now properly handles notifyDataSetChanged"
Mike LeBeau [Thu, 9 Sep 2010 00:43:15 +0000 (17:43 -0700)]
Merge "Add MediaStore.ACTION_MEDIA_PLAY_FROM_SEARCH intent for open-ended search and play of music. This is used, for instance, by Google's new "listen to" Voice Action." into gingerbread
Eric Laurent [Thu, 9 Sep 2010 00:22:54 +0000 (17:22 -0700)]
am
e126119c: am
95d86480: Merge "Modify type of some environmental reverb parameters" into gingerbread
Merge commit '
e126119c3a406bc564f2549aeb1416aff112689d'
* commit '
e126119c3a406bc564f2549aeb1416aff112689d':
Modify type of some environmental reverb parameters
Eric Laurent [Thu, 9 Sep 2010 00:19:43 +0000 (17:19 -0700)]
am
95d86480: Merge "Modify type of some environmental reverb parameters" into gingerbread
Merge commit '
95d8648054223a501fe5390edef7e5d9383a4be8' into gingerbread-plus-aosp
* commit '
95d8648054223a501fe5390edef7e5d9383a4be8':
Modify type of some environmental reverb parameters
Eric Laurent [Thu, 9 Sep 2010 00:17:38 +0000 (17:17 -0700)]
Merge "Modify type of some environmental reverb parameters" into gingerbread
Mathias Agopian [Wed, 8 Sep 2010 23:50:13 +0000 (16:50 -0700)]
am
3fa7d8af: am
9bfb060a: Merge "Force wallpaper surface to 565." into gingerbread
Merge commit '
3fa7d8af6560de07ef673f73308f7e51de64e4ec'
* commit '
3fa7d8af6560de07ef673f73308f7e51de64e4ec':
Force wallpaper surface to 565.
Mathias Agopian [Wed, 8 Sep 2010 23:46:46 +0000 (16:46 -0700)]
am
9bfb060a: Merge "Force wallpaper surface to 565." into gingerbread
Merge commit '
9bfb060ac4e30c82ec2c269b78cc758a6cb5daf8' into gingerbread-plus-aosp
* commit '
9bfb060ac4e30c82ec2c269b78cc758a6cb5daf8':
Force wallpaper surface to 565.
Mathias Agopian [Wed, 8 Sep 2010 23:43:42 +0000 (16:43 -0700)]
Merge "Force wallpaper surface to 565." into gingerbread
Adam Powell [Wed, 8 Sep 2010 23:14:47 +0000 (16:14 -0700)]
Merge "Added resources and styles for ActionBar tabs"
John Wang [Wed, 8 Sep 2010 23:00:11 +0000 (16:00 -0700)]
am
d8f62ec4: am
a48dc39b: Add hangupForegroundResumeBackground().
Merge commit '
d8f62ec44706153490bf63cddeac7d9c76e9e742'
* commit '
d8f62ec44706153490bf63cddeac7d9c76e9e742':
Add hangupForegroundResumeBackground().
John Wang [Wed, 8 Sep 2010 22:56:41 +0000 (15:56 -0700)]
am
a48dc39b: Add hangupForegroundResumeBackground().
Merge commit '
a48dc39bd55c5ddcd991e08f791fd18d94a0db12' into gingerbread-plus-aosp
* commit '
a48dc39bd55c5ddcd991e08f791fd18d94a0db12':
Add hangupForegroundResumeBackground().
Brad Fitzpatrick [Wed, 8 Sep 2010 22:51:41 +0000 (15:51 -0700)]
am
f2bf6d6e: am
65634a79: Merge "Don\'t block in the BackupManagerService.dataChanged() Binder call." into gingerbread
Merge commit '
f2bf6d6e705b655a546a9e6435e6acef3a82cda3'
* commit '
f2bf6d6e705b655a546a9e6435e6acef3a82cda3':
Don't block in the BackupManagerService.dataChanged() Binder call.
Gilles Debunne [Wed, 8 Sep 2010 22:50:50 +0000 (15:50 -0700)]
am
de5cfcb6: am
d9c80ab3: Merge "Fix for a memory leak in TextKeyListener." into gingerbread
Merge commit '
de5cfcb608f3432d98ae17e0febb6e726df79e90'
* commit '
de5cfcb608f3432d98ae17e0febb6e726df79e90':
Fix for a memory leak in TextKeyListener.
Robert Greenwalt [Wed, 8 Sep 2010 22:35:40 +0000 (15:35 -0700)]
Merge "Some cleanup of Proxy class."
Brad Fitzpatrick [Wed, 8 Sep 2010 22:26:57 +0000 (15:26 -0700)]
am
65634a79: Merge "Don\'t block in the BackupManagerService.dataChanged() Binder call." into gingerbread
Merge commit '
65634a7935ed6f173179e7ac91a05288693b2bbf' into gingerbread-plus-aosp
* commit '
65634a7935ed6f173179e7ac91a05288693b2bbf':
Don't block in the BackupManagerService.dataChanged() Binder call.
Brad Fitzpatrick [Wed, 8 Sep 2010 22:20:20 +0000 (15:20 -0700)]
Merge "Don't block in the BackupManagerService.dataChanged() Binder call." into gingerbread
Romain Guy [Wed, 8 Sep 2010 22:16:13 +0000 (15:16 -0700)]
Merge "Fix possible infinite loop when purging textures."
Gilles Debunne [Wed, 8 Sep 2010 22:02:20 +0000 (15:02 -0700)]
am
d9c80ab3: Merge "Fix for a memory leak in TextKeyListener." into gingerbread
Merge commit '
d9c80ab31ac3755141765e2c030bd1404ff0b050' into gingerbread-plus-aosp
* commit '
d9c80ab31ac3755141765e2c030bd1404ff0b050':
Fix for a memory leak in TextKeyListener.
Gilles Debunne [Wed, 8 Sep 2010 21:58:23 +0000 (14:58 -0700)]
Merge "Fix for a memory leak in TextKeyListener." into gingerbread
Dianne Hackborn [Wed, 8 Sep 2010 21:38:20 +0000 (14:38 -0700)]
am
5fdacb8a: am
ee455f5a: Merge "People holding partial wake locks now get blamed for CPU usage." into gingerbread
Merge commit '
5fdacb8a2818136218afdea4308ad1b10049a201'
* commit '
5fdacb8a2818136218afdea4308ad1b10049a201':
People holding partial wake locks now get blamed for CPU usage.
Jake Hamby [Wed, 8 Sep 2010 21:38:15 +0000 (14:38 -0700)]
am
e7578344: am
5872e9d7: Merge "Allow incoming SMS until internal storage is almost full." into gingerbread
Merge commit '
e75783440a55fb0a5ef75066be94a11898f652f0'
* commit '
e75783440a55fb0a5ef75066be94a11898f652f0':
Allow incoming SMS until internal storage is almost full.
Jeff Brown [Wed, 8 Sep 2010 21:38:09 +0000 (14:38 -0700)]
Dianne Hackborn [Wed, 8 Sep 2010 21:34:41 +0000 (14:34 -0700)]
am
ee455f5a: Merge "People holding partial wake locks now get blamed for CPU usage." into gingerbread
Merge commit '
ee455f5a9572bc0d23c3328f6c22da91dc109a50' into gingerbread-plus-aosp
* commit '
ee455f5a9572bc0d23c3328f6c22da91dc109a50':
People holding partial wake locks now get blamed for CPU usage.
Jake Hamby [Wed, 8 Sep 2010 21:34:31 +0000 (14:34 -0700)]
am
5872e9d7: Merge "Allow incoming SMS until internal storage is almost full." into gingerbread
Merge commit '
5872e9d7f31e5a4c5f3d871dba02b6d72a7ada78' into gingerbread-plus-aosp
* commit '
5872e9d7f31e5a4c5f3d871dba02b6d72a7ada78':
Allow incoming SMS until internal storage is almost full.
Jeff Brown [Wed, 8 Sep 2010 21:34:26 +0000 (14:34 -0700)]
am
b21fb104: Fix key repeat delay.
Merge commit '
b21fb104cc95fe7e5daf3b3626241e525c39a3f1' into gingerbread-plus-aosp
* commit '
b21fb104cc95fe7e5daf3b3626241e525c39a3f1':
Fix key repeat delay.
Joe Onorato [Wed, 8 Sep 2010 21:30:05 +0000 (14:30 -0700)]
Merge "move recent apps around, attempting to make it not crash."
Dianne Hackborn [Wed, 8 Sep 2010 21:15:35 +0000 (14:15 -0700)]
Merge "People holding partial wake locks now get blamed for CPU usage." into gingerbread
Jeff Brown [Wed, 8 Sep 2010 21:03:10 +0000 (14:03 -0700)]
am
6bb72458: (-s ours) am
de2f3340: Update current.xml for touch filtering feature.
Merge commit '
6bb72458f934f00fdfee75323a7919a9f10eba03'
* commit '
6bb72458f934f00fdfee75323a7919a9f10eba03':
Update current.xml for touch filtering feature.
Jeff Brown [Wed, 8 Sep 2010 20:02:55 +0000 (13:02 -0700)]
resolved conflicts for merge of
a05088c1 to master
Change-Id: I7973f9f28586dec9b9659f8f662f40db7997a521
Jake Hamby [Wed, 8 Sep 2010 19:49:27 +0000 (12:49 -0700)]
Merge "Allow incoming SMS until internal storage is almost full." into gingerbread
Jeff Brown [Wed, 8 Sep 2010 19:29:49 +0000 (12:29 -0700)]
am
de2f3340: Update current.xml for touch filtering feature.
Merge commit '
de2f3340d64e20e51029ff438f0d635d97b8a3e0' into gingerbread-plus-aosp
* commit '
de2f3340d64e20e51029ff438f0d635d97b8a3e0':
Update current.xml for touch filtering feature.
Jeff Brown [Tue, 7 Sep 2010 17:44:57 +0000 (10:44 -0700)]
Fix key repeat delay.
Change-Id: I6216e082324ee29bf50e37acc673350ca5417c4d
Joe Onorato [Wed, 8 Sep 2010 19:11:55 +0000 (12:11 -0700)]
Merge "Fix build due to stubs errors on filename changes"
Jeff Brown [Wed, 8 Sep 2010 18:55:24 +0000 (11:55 -0700)]
am
85a31767: Add support for secure views.
Merge commit '
85a3176704b5bfbeece9bd928369fbb76eec7dc6' into gingerbread-plus-aosp
* commit '
85a3176704b5bfbeece9bd928369fbb76eec7dc6':
Add support for secure views.
Jeff Brown [Thu, 2 Sep 2010 00:01:00 +0000 (17:01 -0700)]
Add support for secure views.
Added the MotionEvent.FLAG_WINDOW_IS_OBSCURED flag which is set by the
input manager whenever another visible window is partly or wholly obscured
the target of a touch event so that applications can filter touches
accordingly.
Added a "filterTouchesWhenObscured" attribute to View which can be used to
enable filtering of touches when the view's window is obscured.
Change-Id: I936d9c85013fd2d77fb296a600528d30a29027d2
Jack Veenstra [Wed, 8 Sep 2010 18:44:05 +0000 (11:44 -0700)]
Merge "Add support for giving arrays of ints and longs to the "am" command."
Jean-Baptiste Queru [Wed, 8 Sep 2010 18:07:30 +0000 (11:07 -0700)]
am
6ffee9bb: Merge "Revert "resolve conflicts"" into gingerbread-plus-aosp
Merge commit '
6ffee9bbba53700d33456261b986ac8a3f333b9e'
* commit '
6ffee9bbba53700d33456261b986ac8a3f333b9e':
Revert "resolve conflicts"
Erik [Wed, 8 Sep 2010 18:04:41 +0000 (11:04 -0700)]
am
c4f628a1: am
c0b4f6d3: Merge "Adds a time zone parameter to formatDateRange" into gingerbread
Merge commit '
c4f628a1ba359926cf53ed7652d9abba6ea29123'
* commit '
c4f628a1ba359926cf53ed7652d9abba6ea29123':
Adds a time zone parameter to formatDateRange
Jean-Baptiste Queru [Wed, 8 Sep 2010 18:03:22 +0000 (11:03 -0700)]
Merge "Revert "resolve conflicts"" into gingerbread-plus-aosp
Erik [Wed, 8 Sep 2010 18:01:27 +0000 (11:01 -0700)]
am
c0b4f6d3: Merge "Adds a time zone parameter to formatDateRange" into gingerbread
Merge commit '
c0b4f6d30d962d75125628317b5f5ea622531dfe' into gingerbread-plus-aosp
* commit '
c0b4f6d30d962d75125628317b5f5ea622531dfe':
Adds a time zone parameter to formatDateRange
Erik [Wed, 8 Sep 2010 17:58:12 +0000 (10:58 -0700)]
Merge "Adds a time zone parameter to formatDateRange" into gingerbread
Mike Lockwood [Wed, 8 Sep 2010 17:52:44 +0000 (10:52 -0700)]
Merge changes Ib18b93bf,I4c86d7e3
* changes:
MTP: Allow transfering arbitrary file types.
Rename the media database's "objects" table to "files"
Gilles Debunne [Wed, 8 Sep 2010 17:38:45 +0000 (10:38 -0700)]
am
d4fd86d1: (-s ours) am
468394fc: Text Selection: smart word detection. DO NOT MERGE.
Merge commit '
d4fd86d19a070a355255b51742075fbf8e69fa4a'
* commit '
d4fd86d19a070a355255b51742075fbf8e69fa4a':
Text Selection: smart word detection. DO NOT MERGE.
Elliott Hughes [Wed, 8 Sep 2010 17:38:41 +0000 (10:38 -0700)]
am
664c48e9: am
4c7d3f28: Merge "Remove dead code: NIOBuffer." into gingerbread
Merge commit '
664c48e991a70d07646d54125e97f579f3a33be4'
* commit '
664c48e991a70d07646d54125e97f579f3a33be4':
Remove dead code: NIOBuffer.
Chung-yih Wang [Wed, 8 Sep 2010 17:38:35 +0000 (10:38 -0700)]
am
4f24aed2: am
66907078: Merge "Fix the dialing from contact for internet address." into gingerbread
Merge commit '
4f24aed2a13d9ba89e2402894353176e19571e6e'
* commit '
4f24aed2a13d9ba89e2402894353176e19571e6e':
Fix the dialing from contact for internet address.
Chung-yih Wang [Wed, 8 Sep 2010 17:35:11 +0000 (10:35 -0700)]
am
576b492c: am
5de1d36d: Log outbound proxy address if exists for debugging.
Merge commit '
576b492c15a079c9d3d818f3f7fadc4408c2908a'
* commit '
576b492c15a079c9d3d818f3f7fadc4408c2908a':
Log outbound proxy address if exists for debugging.
Gilles Debunne [Wed, 8 Sep 2010 17:32:42 +0000 (10:32 -0700)]
am
468394fc: Text Selection: smart word detection. DO NOT MERGE.
Merge commit '
468394fc6d1cb0c9078c2f98aa056860f7e0d743' into gingerbread-plus-aosp
* commit '
468394fc6d1cb0c9078c2f98aa056860f7e0d743':
Text Selection: smart word detection. DO NOT MERGE.
Elliott Hughes [Wed, 8 Sep 2010 17:32:38 +0000 (10:32 -0700)]
am
4c7d3f28: Merge "Remove dead code: NIOBuffer." into gingerbread
Merge commit '
4c7d3f28898f4e0d8e9f54537fb92948e650df7f' into gingerbread-plus-aosp
* commit '
4c7d3f28898f4e0d8e9f54537fb92948e650df7f':
Remove dead code: NIOBuffer.
Chung-yih Wang [Wed, 8 Sep 2010 17:32:13 +0000 (10:32 -0700)]
am
66907078: Merge "Fix the dialing from contact for internet address." into gingerbread
Merge commit '
669070787cc10377c2e5c3fa187babc728d96245' into gingerbread-plus-aosp
* commit '
669070787cc10377c2e5c3fa187babc728d96245':
Fix the dialing from contact for internet address.
Jean-Baptiste Queru [Wed, 8 Sep 2010 17:28:41 +0000 (10:28 -0700)]
am
84f992a2: resolve conflicts
Merge commit '
84f992a249491b9f755e879bf096baac3f9472f5'
* commit '
84f992a249491b9f755e879bf096baac3f9472f5':
Adding Download Manager Integration, stress, and hosts-based tests.
Chung-yih Wang [Wed, 8 Sep 2010 17:28:09 +0000 (10:28 -0700)]
am
5de1d36d: Log outbound proxy address if exists for debugging.
Merge commit '
5de1d36dd0415c4cf9afdf093a4915951ef6c770' into gingerbread-plus-aosp
* commit '
5de1d36dd0415c4cf9afdf093a4915951ef6c770':
Log outbound proxy address if exists for debugging.
Chet Haase [Wed, 8 Sep 2010 17:25:19 +0000 (10:25 -0700)]
Merge "Rename several animation classes"
Makoto Onuki [Wed, 8 Sep 2010 17:14:01 +0000 (10:14 -0700)]
Merge "Added "Memory observability" to javadoc."
Jean-Baptiste Queru [Wed, 8 Sep 2010 17:02:35 +0000 (10:02 -0700)]
resolve conflicts
Change-Id: I87f854430f7083cd2f2e28b4ec4a7112ef6fe4f1
Gilles Debunne [Wed, 8 Sep 2010 17:01:46 +0000 (10:01 -0700)]
Merge "Made text selection work in ExtractEditText. Manual merge of Gingerbread 64947."
Lorenzo Colitti [Wed, 8 Sep 2010 16:30:45 +0000 (09:30 -0700)]
Merge "Framework changes for IPv6 / IPv4v6 data calls."
Elliott Hughes [Wed, 8 Sep 2010 16:30:41 +0000 (09:30 -0700)]
Merge "Remove dead code: NIOBuffer." into gingerbread
Mike Lockwood [Wed, 8 Sep 2010 13:52:51 +0000 (06:52 -0700)]
Merge "Fix Intent.ACTION_REBOOT"
Chung-yih Wang [Wed, 8 Sep 2010 10:32:01 +0000 (03:32 -0700)]
Merge "Fix the dialing from contact for internet address." into gingerbread
OSDN Git Service
