OSDN Git Service
Jean-Baptiste Queru [Wed, 11 Aug 2010 16:52:34 +0000 (09:52 -0700)]
am
92798a48: am
076d0654: Merge "SIM toolkit enhancements and bug fixes"
Merge commit '
92798a481cbd928711339606bc1d9e81fa80f7b2'
* commit '
92798a481cbd928711339606bc1d9e81fa80f7b2':
SIM toolkit enhancements and bug fixes
Jean-Baptiste Queru [Wed, 11 Aug 2010 16:44:27 +0000 (09:44 -0700)]
am
076d0654: Merge "SIM toolkit enhancements and bug fixes"
Merge commit '
076d06547f90c480a4ed19da6f4b3d1270f57ec9' into gingerbread-plus-aosp
* commit '
076d06547f90c480a4ed19da6f4b3d1270f57ec9':
SIM toolkit enhancements and bug fixes
Jean-Baptiste Queru [Wed, 11 Aug 2010 16:29:03 +0000 (09:29 -0700)]
Merge "SIM toolkit enhancements and bug fixes"
Alex Sakhartchouk [Wed, 11 Aug 2010 16:02:51 +0000 (09:02 -0700)]
Merge "Adding quaternion functions to math library."
Daniel Sandler [Wed, 11 Aug 2010 15:47:44 +0000 (08:47 -0700)]
Merge "Apparently people want to know what time it is."
Daniel Sandler [Wed, 11 Aug 2010 15:45:22 +0000 (11:45 -0400)]
Apparently people want to know what time it is.
Bug:
2897410
Change-Id: I8a9a995cf50d197f1f8894455372d0e325eb3eae
Irfan Sheriff [Wed, 11 Aug 2010 15:11:31 +0000 (08:11 -0700)]
Fix build
A local change had remained.
Change-Id: Iad01d6da7f6cc75b470296383e1121d21008883a
Irfan Sheriff [Wed, 11 Aug 2010 14:53:51 +0000 (07:53 -0700)]
Merge "Split WifiStateMachine from WifiStateTracker"
Patrick Scott [Wed, 11 Aug 2010 14:21:25 +0000 (07:21 -0700)]
am
dc1f0858: am
9902196f: Fix npe in getCacheTotalSize.
Merge commit '
dc1f08586eadc3a3dbbdf22b520ba1065b2032f8'
* commit '
dc1f08586eadc3a3dbbdf22b520ba1065b2032f8':
Fix npe in getCacheTotalSize.
Patrick Scott [Wed, 11 Aug 2010 14:18:27 +0000 (07:18 -0700)]
am
9902196f: Fix npe in getCacheTotalSize.
Merge commit '
9902196f9885d369e37cf44084e3f04513511ab0' into gingerbread-plus-aosp
* commit '
9902196f9885d369e37cf44084e3f04513511ab0':
Fix npe in getCacheTotalSize.
Patrick Scott [Wed, 11 Aug 2010 13:48:43 +0000 (09:48 -0400)]
Fix npe in getCacheTotalSize.
Bug:
2882277
Change-Id: I9319a48e0ed75561d3d04691fb288f69d11edc84
Maksymilian Osowski [Wed, 11 Aug 2010 12:26:38 +0000 (05:26 -0700)]
Merge "Added a basic version of python script and supporting code in DumpRenderTree."
Maksymilian Osowski [Wed, 11 Aug 2010 11:42:57 +0000 (12:42 +0100)]
Fixes crash when root dir does not exist.
Bug:
2904439
Change-Id: I629f88626e165348dd414f3ad49d9b415ab336cf
Maksymilian Osowski [Mon, 9 Aug 2010 13:35:05 +0000 (14:35 +0100)]
Added a basic version of python script and supporting code in DumpRenderTree.
Change-Id: Ic60ef9b89f74a3a36a4c31765f99c8de08dce911
Maksymilian Osowski [Wed, 11 Aug 2010 11:02:21 +0000 (04:02 -0700)]
Merge "Resets Summarizer after everything's finished."
Hung-ying Tyan [Wed, 11 Aug 2010 10:09:42 +0000 (03:09 -0700)]
am
03381faf: (-s ours) am
1777a274: SIP: remove unused file.
Merge commit '
03381faf3492cd1360b3d239c6f23a801c9d4b7f'
* commit '
03381faf3492cd1360b3d239c6f23a801c9d4b7f':
SIP: remove unused file.
Hung-ying Tyan [Wed, 11 Aug 2010 08:56:56 +0000 (01:56 -0700)]
am
1777a274: SIP: remove unused file.
Merge commit '
1777a2748bfa25dfd9d081d71504572b9a7256b1' into gingerbread-plus-aosp
* commit '
1777a2748bfa25dfd9d081d71504572b9a7256b1':
SIP: remove unused file.
Hung-ying Tyan [Wed, 11 Aug 2010 08:48:14 +0000 (16:48 +0800)]
SIP: remove unused file.
Change-Id: Ifb3582da888926e62775a73a6b3080d15f1c3e42
Dianne Hackborn [Wed, 11 Aug 2010 07:50:56 +0000 (00:50 -0700)]
am
679ac09a: am
a5ae50cd: Merge "More native work." into gingerbread
Merge commit '
679ac09a5c22175354f3a04b28456b323839530e'
* commit '
679ac09a5c22175354f3a04b28456b323839530e':
More native work.
Dianne Hackborn [Wed, 11 Aug 2010 07:47:51 +0000 (00:47 -0700)]
am
a5ae50cd: Merge "More native work." into gingerbread
Merge commit '
a5ae50cd838b5725c63ed485292aae4edd1a98cb' into gingerbread-plus-aosp
* commit '
a5ae50cd838b5725c63ed485292aae4edd1a98cb':
More native work.
Dianne Hackborn [Wed, 11 Aug 2010 07:45:44 +0000 (00:45 -0700)]
Merge "More native work." into gingerbread
Dianne Hackborn [Wed, 4 Aug 2010 18:12:40 +0000 (11:12 -0700)]
More native work.
Implement save/restore of state, and add native APIs for
configuration information.
Change-Id: I2a3ddc2ba605db58d7c8b2b31b9215fb323f90b5
Chung-yih Wang [Wed, 11 Aug 2010 06:44:52 +0000 (23:44 -0700)]
am
0a6db9be: am
2725a655: Fix a bug in unregisterPhone().
Merge commit '
0a6db9bebbd58c6a7e2ad2070d2649a2be57a09a'
* commit '
0a6db9bebbd58c6a7e2ad2070d2649a2be57a09a':
Fix a bug in unregisterPhone().
Chung-yih Wang [Wed, 11 Aug 2010 06:41:48 +0000 (23:41 -0700)]
am
2725a655: Fix a bug in unregisterPhone().
Merge commit '
2725a6551261044318e42ccc9ebeabed7edf5ee7' into gingerbread-plus-aosp
* commit '
2725a6551261044318e42ccc9ebeabed7edf5ee7':
Fix a bug in unregisterPhone().
Chung-yih Wang [Wed, 11 Aug 2010 06:22:34 +0000 (14:22 +0800)]
Fix a bug in unregisterPhone().
Change-Id: Ifaef66d45043dc5376688a77f9d18124a9c29576
Romain Guy [Wed, 11 Aug 2010 04:56:12 +0000 (21:56 -0700)]
Merge "Support non-PorterDuff xfermodes with Xfermode."
Romain Guy [Wed, 11 Aug 2010 04:55:44 +0000 (21:55 -0700)]
Support non-PorterDuff xfermodes with Xfermode.
Change-Id: Icef17b72da2d047a24aaac1ddf5cdae77b40d5b4
Hung-ying Tyan [Wed, 11 Aug 2010 04:54:07 +0000 (21:54 -0700)]
am
9a025349: am
091c5238: Merge "SipAudioCall: perform local ops before network op in endCall()" into gingerbread
Merge commit '
9a025349dc5a4e699fbe99a714f523e9903fa534'
* commit '
9a025349dc5a4e699fbe99a714f523e9903fa534':
SipAudioCall: perform local ops before network op in endCall()
Chung-yih Wang [Wed, 11 Aug 2010 04:54:01 +0000 (21:54 -0700)]
am
2c9de2b9: am
f57324cf: Add getSipUri() for identification.
Merge commit '
2c9de2b9e5568c8918b36866d3cf20833a8c20e1'
* commit '
2c9de2b9e5568c8918b36866d3cf20833a8c20e1':
Add getSipUri() for identification.
Yu Shan Emily Lau [Wed, 11 Aug 2010 04:53:54 +0000 (21:53 -0700)]
am
1ded9f95: am
fbb936bf: Merge "Add the a power test case which simply do the audio playback. The actual power measurement will be done by another application." into gingerbread
Merge commit '
1ded9f95636a83298658bfcd840ae8e51127c714'
* commit '
1ded9f95636a83298658bfcd840ae8e51127c714':
Add the a power test case which simply do the audio playback. The actual power measurement will be done by another application.
Konstantin Lopyrev [Wed, 11 Aug 2010 04:53:49 +0000 (21:53 -0700)]
am
8279c754: am
91a7f5fe: Making sure that the prefix is handled properly.
Merge commit '
8279c754d176d5c2aa23f6f7ad16fcea03278788'
* commit '
8279c754d176d5c2aa23f6f7ad16fcea03278788':
Making sure that the prefix is handled properly.
Adam Powell [Wed, 11 Aug 2010 04:53:40 +0000 (21:53 -0700)]
am
e8fa85d7: am
224ab9a5: Merge "Fix public bug code.google.com/p/android/issues/detail?id=10067" into gingerbread
Merge commit '
e8fa85d7a1a75d6894a75b1c25abf99bbff50085'
* commit '
e8fa85d7a1a75d6894a75b1c25abf99bbff50085':
Fix public bug http://code.google.com/p/android/issues/detail?id=10067
Konstantin Lopyrev [Wed, 11 Aug 2010 04:49:04 +0000 (21:49 -0700)]
Merge "resolved conflicts for merge of
f00ee0f7 to master"
Konstantin Lopyrev [Wed, 11 Aug 2010 04:47:34 +0000 (21:47 -0700)]
resolved conflicts for merge of
f00ee0f7 to master
Change-Id: I13b968bde37fad8fffdaa9bb94a0f1da9b2e6e0c
Romain Guy [Wed, 11 Aug 2010 04:43:09 +0000 (21:43 -0700)]
Merge "Add extra blending modes."
Romain Guy [Wed, 11 Aug 2010 02:21:34 +0000 (19:21 -0700)]
Add extra blending modes.
This change adds the following blending modes for shaders and color filters:
Add
Multiply
Screen
Overlay
Darken
Lighten
Change-Id: Iff22f5ce6041b43c71b1857d73013f5010ab3413
Hung-ying Tyan [Wed, 11 Aug 2010 03:50:40 +0000 (20:50 -0700)]
am
091c5238: Merge "SipAudioCall: perform local ops before network op in endCall()" into gingerbread
Merge commit '
091c5238a00ca51dc69b8b09459e6ac88e1eb077' into gingerbread-plus-aosp
* commit '
091c5238a00ca51dc69b8b09459e6ac88e1eb077':
SipAudioCall: perform local ops before network op in endCall()
Hung-ying Tyan [Wed, 11 Aug 2010 03:48:18 +0000 (20:48 -0700)]
Merge "SipAudioCall: perform local ops before network op in endCall()" into gingerbread
Chung-yih Wang [Wed, 11 Aug 2010 03:47:18 +0000 (20:47 -0700)]
am
f57324cf: Add getSipUri() for identification.
Merge commit '
f57324cf4f82947296f4d1acb9df1f3c9c03134e' into gingerbread-plus-aosp
* commit '
f57324cf4f82947296f4d1acb9df1f3c9c03134e':
Add getSipUri() for identification.
Chung-yih Wang [Wed, 11 Aug 2010 03:12:05 +0000 (11:12 +0800)]
Add getSipUri() for identification.
Change-Id: Iabffd38ad554c34a34977c833e6699747cbf0f63
Yu Shan Emily Lau [Wed, 11 Aug 2010 03:09:24 +0000 (20:09 -0700)]
am
fbb936bf: Merge "Add the a power test case which simply do the audio playback. The actual power measurement will be done by another application." into gingerbread
Merge commit '
fbb936bfab22cb1c3748cccffe67f42f7d764b54' into gingerbread-plus-aosp
* commit '
fbb936bfab22cb1c3748cccffe67f42f7d764b54':
Add the a power test case which simply do the audio playback. The actual power measurement will be done by another application.
Yu Shan Emily Lau [Wed, 11 Aug 2010 03:06:39 +0000 (20:06 -0700)]
Merge "Add the a power test case which simply do the audio playback. The actual power measurement will be done by another application." into gingerbread
Yu Shan Emily Lau [Wed, 11 Aug 2010 01:30:44 +0000 (18:30 -0700)]
Add the a power test case which simply do the audio playback. The actual power measurement will be done by another application.
Change-Id: I51008ffdbe60e7e0b298091eb914b74f2d6731f8
Konstantin Lopyrev [Wed, 11 Aug 2010 02:02:51 +0000 (19:02 -0700)]
am
91a7f5fe: Making sure that the prefix is handled properly.
Merge commit '
91a7f5fef8a9fc496acef23f513cb48139e8dff5' into gingerbread-plus-aosp
* commit '
91a7f5fef8a9fc496acef23f513cb48139e8dff5':
Making sure that the prefix is handled properly.
Konstantin Lopyrev [Wed, 11 Aug 2010 01:54:54 +0000 (18:54 -0700)]
Making sure that the prefix is handled properly.
Change-Id: Ic50327b1ed4d6b54753b5b3887508a53cd7a3497
Jason Sams [Wed, 11 Aug 2010 01:46:50 +0000 (18:46 -0700)]
Merge "Refcounting in allocations."
Jason Sams [Wed, 11 Aug 2010 01:45:41 +0000 (18:45 -0700)]
Merge "Update image processing to cleaup code by not inlining functions that should be handled by the runtime."
Adam Powell [Wed, 11 Aug 2010 00:54:58 +0000 (17:54 -0700)]
am
224ab9a5: Merge "Fix public bug code.google.com/p/android/issues/detail?id=10067" into gingerbread
Merge commit '
224ab9a5c6f7ae70fe55bf3d5604cbdf883baee7' into gingerbread-plus-aosp
* commit '
224ab9a5c6f7ae70fe55bf3d5604cbdf883baee7':
Fix public bug http://code.google.com/p/android/issues/detail?id=10067
Konstantin Lopyrev [Wed, 11 Aug 2010 00:52:32 +0000 (17:52 -0700)]
am
f39d5987: Merge "Categorizing exported view properties." into gingerbread
Merge commit '
f39d5987b977fdff8c34a2ddabaec31d1e909db3' into gingerbread-plus-aosp
* commit '
f39d5987b977fdff8c34a2ddabaec31d1e909db3':
Categorizing exported view properties.
Adam Powell [Wed, 11 Aug 2010 00:52:15 +0000 (17:52 -0700)]
Merge "Fix public bug code.google.com/p/android/issues/detail?id=10067" into gingerbread
Adam Powell [Wed, 11 Aug 2010 00:50:11 +0000 (17:50 -0700)]
Fix public bug code.google.com/p/android/issues/detail?id=10067
Change-Id: I7b7a9a32e82fc7541beabe286b20b01f39406cc8
Konstantin Lopyrev [Wed, 11 Aug 2010 00:48:27 +0000 (17:48 -0700)]
Merge "Categorizing exported view properties." into gingerbread
Konstantin Lopyrev [Wed, 11 Aug 2010 00:02:18 +0000 (17:02 -0700)]
Categorizing exported view properties.
Change-Id: I79c42019836973d80662c21d195d088ae01537a0
Alex Sakhartchouk [Wed, 11 Aug 2010 00:34:39 +0000 (17:34 -0700)]
Adding quaternion functions to math library.
Change-Id: I692214648892120943ca7d3b00034e27d1c330cf
Romain Guy [Wed, 11 Aug 2010 00:27:21 +0000 (17:27 -0700)]
Merge "Add support for text underline and strikethru."
Romain Guy [Wed, 11 Aug 2010 00:26:42 +0000 (17:26 -0700)]
Add support for text underline and strikethru.
Change-Id: I3a0e6643d7cafbdd06d9a908c8cf9347dcaba146
Adam Powell [Tue, 10 Aug 2010 23:36:56 +0000 (16:36 -0700)]
Fix bug
2908851 - ActionBar does not get initialized if
set/addContentView is never called.
Fix bugs around lazy initialization of ActionBar in Activities.
Change-Id: I39a4216a7f6b0051adc4a669b8f921f94148e1db
Adam Powell [Tue, 10 Aug 2010 23:58:44 +0000 (16:58 -0700)]
Merge "Fix bug
2908822 - open/closePanel should do the right thing with ActionBars"
Adam Powell [Tue, 10 Aug 2010 23:58:37 +0000 (16:58 -0700)]
Adam Cohen [Tue, 10 Aug 2010 23:55:15 +0000 (16:55 -0700)]
Merge "Fixing StackView crash associated with DataSetObserver"
Daniel Sandler [Tue, 10 Aug 2010 23:50:57 +0000 (16:50 -0700)]
Merge "Incremental system bar improvements."
Adam Cohen [Tue, 10 Aug 2010 23:47:30 +0000 (16:47 -0700)]
Fixing StackView crash associated with DataSetObserver
Change-Id: Idbc8ed09ee8a58757b7383d6331a4c0357a6fb1f
Jeff Brown [Tue, 10 Aug 2010 23:39:10 +0000 (16:39 -0700)]
am
95105f3c: am
c3fc2d03: Fix safe mode and KeyEvent.getMaxKeyCode().
Merge commit '
95105f3c25110f28b236cfa71e9ad74533eef854'
* commit '
95105f3c25110f28b236cfa71e9ad74533eef854':
Fix safe mode and KeyEvent.getMaxKeyCode().
Jeff Brown [Tue, 10 Aug 2010 23:38:58 +0000 (16:38 -0700)]
am
d3cf0544: am
d98d0fc6: Merge "Optimize VelocityTracker to run in linear time." into gingerbread
Merge commit '
d3cf0544cc7eec8ace3dc3b7fc17b7dac69e0aab'
* commit '
d3cf0544cc7eec8ace3dc3b7fc17b7dac69e0aab':
Optimize VelocityTracker to run in linear time.
Jeff Brown [Tue, 10 Aug 2010 23:33:47 +0000 (16:33 -0700)]
am
c3fc2d03: Fix safe mode and KeyEvent.getMaxKeyCode().
Merge commit '
c3fc2d03d58a258c53c9265a70143d4af076b764' into gingerbread-plus-aosp
* commit '
c3fc2d03d58a258c53c9265a70143d4af076b764':
Fix safe mode and KeyEvent.getMaxKeyCode().
Jeff Brown [Tue, 10 Aug 2010 23:31:04 +0000 (16:31 -0700)]
am
d98d0fc6: Merge "Optimize VelocityTracker to run in linear time." into gingerbread
Merge commit '
d98d0fc6e9172d3f130794e499462c911920adf6' into gingerbread-plus-aosp
* commit '
d98d0fc6e9172d3f130794e499462c911920adf6':
Optimize VelocityTracker to run in linear time.
Jeff Brown [Tue, 10 Aug 2010 22:47:53 +0000 (15:47 -0700)]
Fix safe mode and KeyEvent.getMaxKeyCode().
Bug:
2901731
Change-Id: I78617c1b9dee3790fc590e5af4b5083368873184
Jeff Brown [Tue, 10 Aug 2010 23:26:56 +0000 (16:26 -0700)]
Merge "Optimize VelocityTracker to run in linear time." into gingerbread
Adam Powell [Tue, 10 Aug 2010 22:59:40 +0000 (15:59 -0700)]
Fix bug
2908822 - open/closePanel should do the right thing with ActionBars
Change-Id: Ic77f9dee864d17046f69c78a1e6d96a49b5c6180
Kenny Root [Tue, 10 Aug 2010 22:47:27 +0000 (15:47 -0700)]
am
a27484f0: am
6061af11: Merge "Sort the IME list before showing to user"
Merge commit '
a27484f068047453af6345f2c2c58fcc1db899a5'
* commit '
a27484f068047453af6345f2c2c58fcc1db899a5':
Sort the IME list before showing to user
Kenny Root [Tue, 10 Aug 2010 22:38:41 +0000 (15:38 -0700)]
am
6061af11: Merge "Sort the IME list before showing to user"
Merge commit '
6061af11cb2b59b6261d12f98b9e8dd395ea8ba7' into gingerbread-plus-aosp
* commit '
6061af11cb2b59b6261d12f98b9e8dd395ea8ba7':
Sort the IME list before showing to user
Adam Powell [Tue, 10 Aug 2010 22:36:44 +0000 (15:36 -0700)]
Fix bug
2908823
Change-Id: Ia20d47ff4e2a09cc0e1ac47cd02a5f152f57073c
Adam Powell [Tue, 10 Aug 2010 22:35:10 +0000 (15:35 -0700)]
Adam Powell [Tue, 10 Aug 2010 22:31:02 +0000 (15:31 -0700)]
Fix bug
2888333
Change-Id: I2e9053e9c68cef447f47d181bfe0ddacc5f7167a
Kenny Root [Tue, 10 Aug 2010 22:22:13 +0000 (15:22 -0700)]
Merge "Sort the IME list before showing to user"
Irfan Sheriff [Wed, 28 Jul 2010 16:35:20 +0000 (09:35 -0700)]
Split WifiStateMachine from WifiStateTracker
Notifications handled in WifiService. WifiStateTracker tracks
state for connectivity service
Change-Id: Idb0cf494898d28712af0f95f9e60c5417cd4a053
Adam Cohen [Tue, 10 Aug 2010 22:10:59 +0000 (15:10 -0700)]
Merge "Preliminary implementation of StackView, which extends AdapterViewAnimator."
Adam Cohen [Thu, 22 Jul 2010 23:00:07 +0000 (16:00 -0700)]
Preliminary implementation of StackView, which extends AdapterViewAnimator.
Change-Id: I3e9d1203fc8848835f28d6bc1c9dc0a3fcf7f242
Romain Guy [Tue, 10 Aug 2010 21:59:18 +0000 (14:59 -0700)]
Merge "Fast text selection drawing."
Romain Guy [Tue, 10 Aug 2010 21:59:15 +0000 (14:59 -0700)]
Fast text selection drawing.
Change-Id: I93fb1312b47bc05345defa9b6cfe47c0658bb329
Andreas Huber [Tue, 10 Aug 2010 21:21:32 +0000 (14:21 -0700)]
am
d35498f6: am
1a140bf6: Merge "Remove some obsolete code." into gingerbread
Merge commit '
d35498f6062410e777d6ad41a720db32336e2089'
* commit '
d35498f6062410e777d6ad41a720db32336e2089':
Remove some obsolete code.
Jeff Hamilton [Tue, 10 Aug 2010 21:02:06 +0000 (16:02 -0500)]
Add a constructor from CursorAdapter to ResourceCursorAdapter.
Change-Id: I423bab1907c24a718a8575d5cbe0cee0e5e4968e
Andreas Huber [Tue, 10 Aug 2010 21:15:11 +0000 (14:15 -0700)]
am
1a140bf6: Merge "Remove some obsolete code." into gingerbread
Merge commit '
1a140bf65c288fcb1458bbd694c9d6e7a567a0f5' into gingerbread-plus-aosp
* commit '
1a140bf65c288fcb1458bbd694c9d6e7a567a0f5':
Remove some obsolete code.
Andreas Huber [Tue, 10 Aug 2010 21:09:39 +0000 (14:09 -0700)]
Merge "Remove some obsolete code." into gingerbread
Mathias Agopian [Tue, 10 Aug 2010 20:55:34 +0000 (13:55 -0700)]
am
553a333d: am
603a34ee: Merge "improve a bit the implementation of eglGetProcAddress" into gingerbread
Merge commit '
553a333d4446bb34330da92f02daa515dc597939'
* commit '
553a333d4446bb34330da92f02daa515dc597939':
improve a bit the implementation of eglGetProcAddress
Mathias Agopian [Tue, 10 Aug 2010 20:52:58 +0000 (13:52 -0700)]
am
603a34ee: Merge "improve a bit the implementation of eglGetProcAddress" into gingerbread
Merge commit '
603a34ee30e7d14ddc02c1beb7bca915622ae4bf' into gingerbread-plus-aosp
* commit '
603a34ee30e7d14ddc02c1beb7bca915622ae4bf':
improve a bit the implementation of eglGetProcAddress
Mathias Agopian [Tue, 10 Aug 2010 20:50:22 +0000 (13:50 -0700)]
Merge "improve a bit the implementation of eglGetProcAddress" into gingerbread
Andreas Huber [Tue, 10 Aug 2010 20:00:52 +0000 (13:00 -0700)]
Remove some obsolete code.
Change-Id: Ic4d21afe3721173d48db44b8ee4f836deee017ad
James Dong [Tue, 10 Aug 2010 20:32:40 +0000 (13:32 -0700)]
am
b9ddd779: am
10ed3f74: Merge "Add input buffer size check for software video encoders" into gingerbread
Merge commit '
b9ddd779ae547b020764b89a0cbd96d589717609'
* commit '
b9ddd779ae547b020764b89a0cbd96d589717609':
Add input buffer size check for software video encoders
James Dong [Tue, 10 Aug 2010 20:28:56 +0000 (13:28 -0700)]
am
10ed3f74: Merge "Add input buffer size check for software video encoders" into gingerbread
Merge commit '
10ed3f7438f6ae797bac32476dc61465c6484c85' into gingerbread-plus-aosp
* commit '
10ed3f7438f6ae797bac32476dc61465c6484c85':
Add input buffer size check for software video encoders
James Dong [Tue, 10 Aug 2010 20:27:09 +0000 (13:27 -0700)]
Merge "Add input buffer size check for software video encoders" into gingerbread
Daniel Sandler [Thu, 5 Aug 2010 20:18:42 +0000 (16:18 -0400)]
Incremental system bar improvements.
- scrolling list of notifications
- fixed crashes when inserting notifications
- new "expand" icon in prep for different touch behavior on
notification icons
- adjustments to the Ticker API in preparation for Kicker
work
Change-Id: I18908cbb2bbbfb7969c7bb48dbda67697732c438
Andreas Huber [Tue, 10 Aug 2010 20:04:42 +0000 (13:04 -0700)]
am
4dc41bb4: am
18f0174f: Merge "We\'re now going to ignore timestamps completely in gtalk video conferencing, playing video as soon as it comes in. We also make up fake timestamps in the rtp code, ignoring rtcp SR information to enable early startup." into gingerbrea
Merge commit '
4dc41bb445860cfcb8c0dfbecdc8f0f5f15f5e28'
* commit '
4dc41bb445860cfcb8c0dfbecdc8f0f5f15f5e28':
We're now going to ignore timestamps completely in gtalk video conferencing, playing video as soon as it comes in. We also make up fake timestamps in the rtp code, ignoring rtcp SR information to enable early startup.
Andreas Huber [Tue, 10 Aug 2010 20:01:58 +0000 (13:01 -0700)]
am
18f0174f: Merge "We\'re now going to ignore timestamps completely in gtalk video conferencing, playing video as soon as it comes in. We also make up fake timestamps in the rtp code, ignoring rtcp SR information to enable early startup." into gingerbread
Merge commit '
18f0174ff4eef46f121e77a0dc1d7a8271621f48' into gingerbread-plus-aosp
* commit '
18f0174ff4eef46f121e77a0dc1d7a8271621f48':
We're now going to ignore timestamps completely in gtalk video conferencing, playing video as soon as it comes in. We also make up fake timestamps in the rtp code, ignoring rtcp SR information to enable early startup.
Andreas Huber [Tue, 10 Aug 2010 19:59:27 +0000 (12:59 -0700)]
Merge "We're now going to ignore timestamps completely in gtalk video conferencing, playing video as soon as it comes in. We also make up fake timestamps in the rtp code, ignoring rtcp SR information to enable early startup." into gingerbread
Romain Guy [Tue, 10 Aug 2010 19:23:49 +0000 (12:23 -0700)]
Merge "Fix tons of bugs and add new text rendering support."
Nipun Kwatra [Tue, 10 Aug 2010 19:22:13 +0000 (12:22 -0700)]
Merge "use usleep instead of sleep."
Romain Guy [Tue, 10 Aug 2010 03:48:09 +0000 (20:48 -0700)]
Fix tons of bugs and add new text rendering support.
Change-Id: I326c66b10784006f6df2f12d38e120cef94cd0d7
Eric Fischer [Tue, 10 Aug 2010 19:18:50 +0000 (12:18 -0700)]
Merge "Import revised translations."
Mike Lockwood [Tue, 10 Aug 2010 19:13:23 +0000 (12:13 -0700)]
Merge "MTP: Fix wrong delete operator from previous change."
OSDN Git Service
