Jamie Gennis
|
2a2789b43c
|
Merge "Add ParcelSurfaceTexture Java class to enable ISurfaceTexture sharing via Binder."
|
2011-06-10 10:05:04 -07:00 |
|
James Dong
|
3931e26714
|
Merge "Call storeMetaDataInVideoBuffers() before get/setParameters() on index OMX_IndexParamPortDefinition"
|
2011-06-10 09:57:01 -07:00 |
|
James Dong
|
5031067de7
|
Merge "Correctly handle crop rect event in SoftAVC.cpp"
|
2011-06-10 09:56:44 -07:00 |
|
Andreas Huber
|
8de356915b
|
Merge "Make dumpsys(media.player) more useful by having AwesomePlayer populate it."
|
2011-06-10 08:02:18 -07:00 |
|
Narayan Kamath
|
7b0bf65288
|
Merge "Don't hardcode the default engine."
|
2011-06-10 07:53:56 -07:00 |
|
Narayan Kamath
|
e1caff6b5c
|
Merge "Some TTS fixes."
|
2011-06-10 06:23:17 -07:00 |
|
Debashish Chatterjee
|
249df4413e
|
Merge "Voicemail provider contract definition."
|
2011-06-10 04:42:32 -07:00 |
|
Debashish Chatterjee
|
4174b3abce
|
Merge "Voicemail related fields in calllog provider."
|
2011-06-10 04:38:07 -07:00 |
|
satok
|
1636c22c0f
|
Merge "API to set additional subtypes"
|
2011-06-10 00:26:52 -07:00 |
|
Adam Powell
|
6976179f39
|
Merge "Action buttons now use themable style."
|
2011-06-09 22:07:11 -07:00 |
|
Brian Carlstrom
|
63db497d0c
|
Merge "KeyChain API refinements"
|
2011-06-09 21:11:50 -07:00 |
|
Adam Powell
|
fdfdacbdca
|
Merge "Refine the behavior of split action bars."
|
2011-06-09 21:08:52 -07:00 |
|
Marco Nelissen
|
c048df0cd7
|
am 6a91953c: am 90dc22fa: am a02d9bf9: Make sure we don\'t read from invalid fds
* commit '6a91953cc9bb8a48d867cc53e3cf5286d9a2f5ac':
Make sure we don't read from invalid fds
|
2011-06-09 18:56:02 -07:00 |
|
Romain Guy
|
46b0cbe5ca
|
Merge "Don't apply AA to rects with no rotation/perspective."
|
2011-06-09 18:55:14 -07:00 |
|
Dianne Hackborn
|
f2cb354757
|
am 8297f669: am 3aabdeac: am 5ba2e872: Merge "Fix for not reporting correct "sw" in compat mode." into honeycomb-mr2
* commit '8297f669356ee997c5faa745815e8b9a7009fba7':
Fix for not reporting correct "sw" in compat mode.
|
2011-06-09 18:42:55 -07:00 |
|
Dianne Hackborn
|
3ca5d8f6e0
|
resolved conflicts for merge of 9dfd7d0a to master
Change-Id: I9fbee3209b7fe5c7b5b42b62309eb60dc49bf9e2
|
2011-06-09 18:39:37 -07:00 |
|
Mathias Agopian
|
c9af56c64b
|
Merge "improve orientation sensor with gyro data"
|
2011-06-09 18:22:19 -07:00 |
|
John Wang
|
396638cfbe
|
am 4d042048: am 08a8f3f9: Merge "Set emergency call text visibility." into honeycomb-LTE
* commit '4d042048243f38d3062ab4719ac26c9154380115':
Set emergency call text visibility.
|
2011-06-09 18:16:49 -07:00 |
|
Mathias Agopian
|
b6dc95800d
|
am 60ee24fe: (-s ours) am 17574b9a: (-s ours) am 19974ecc: Fix a leak in RefBase (DO NOT MERGE)
* commit '60ee24fe487e765c1e6d598aff99b9a5355ef50a':
Fix a leak in RefBase (DO NOT MERGE)
|
2011-06-09 18:16:37 -07:00 |
|
Dianne Hackborn
|
cbbd63fafb
|
Merge "resolved conflicts for merge of e2aa0490 to master"
|
2011-06-09 18:00:13 -07:00 |
|
Romain Guy
|
a4e05c3c2a
|
Merge "Add a way to measure potential framerate of the view hierarchy."
|
2011-06-09 17:50:51 -07:00 |
|
Dianne Hackborn
|
5ea8834ab9
|
resolved conflicts for merge of e2aa0490 to master
Change-Id: Id0448a1598fc93aca0652b29253e02586e35a067
|
2011-06-09 17:50:36 -07:00 |
|
Gilles Debunne
|
1844b17bbc
|
Merge "Text selection on phone"
|
2011-06-09 16:56:31 -07:00 |
|
Irfan Sheriff
|
591d27639e
|
Merge "Remove interface disable in wifistatemachine"
|
2011-06-09 16:53:27 -07:00 |
|
Shimeng (Simon) Wang
|
da82d69345
|
Merge "Consider default zoom scale for mobile viewport."
|
2011-06-09 16:41:18 -07:00 |
|
Daisuke Miyakawa
|
af5d185f3b
|
Merge "Add return value spec and fix typo."
|
2011-06-09 16:34:10 -07:00 |
|
James Dong
|
f349213d71
|
Merge "Fix an issue in MPEG4Writer where the write of outstanding chunks in the last batch was missing"
|
2011-06-09 16:27:39 -07:00 |
|
Andy McFadden
|
35aafe7e15
|
Merge "Use public constants"
|
2011-06-09 16:08:16 -07:00 |
|
Fabrice Di Meglio
|
fe1832ae0f
|
Merge "Add Configuration.getLayoutDirectionFromLocale()"
|
2011-06-09 16:08:00 -07:00 |
|
Shimeng (Simon) Wang
|
fbaaa74d8c
|
Merge "Fix height measure state."
|
2011-06-09 15:56:19 -07:00 |
|
Irfan Sheriff
|
382d1473f4
|
Merge "WifiWatchdogService refactor"
|
2011-06-09 15:47:08 -07:00 |
|
Svetoslav Ganov
|
3f4997996d
|
Merge "Invalid access to AccessibilityInteractionController"
|
2011-06-09 15:45:42 -07:00 |
|
James Dong
|
e7648e122c
|
Merge "Add timestamp and data pointer checks in CameraSource"
|
2011-06-09 15:27:38 -07:00 |
|
Stephen Hines
|
73099c2414
|
Merge "Override equals()/hashCode() for RS BaseObj."
|
2011-06-09 15:06:36 -07:00 |
|
Adam Powell
|
9797ca4634
|
Merge "Fix bug 4501881 - use correct TextAppearances for global actions"
|
2011-06-09 14:34:45 -07:00 |
|
Shimeng (Simon) Wang
|
d8838de634
|
Merge "Better handle double tap for smooth reflow and zoom."
|
2011-06-09 14:10:54 -07:00 |
|
Andy McFadden
|
40a6749c3f
|
Merge "Move CalendarUtils into Calendar app"
|
2011-06-09 14:07:04 -07:00 |
|
John Wang
|
952443d5f4
|
am 3948a2b4: am 735463d1: Merge "Fix layout issue on Xoom when device thinks there\'s a SIM." into honeycomb-LTE
* commit '3948a2b4205c36bc1b4a3911753d970248480742':
Fix layout issue on Xoom when device thinks there's a SIM.
|
2011-06-09 13:55:20 -07:00 |
|
Mathias Agopian
|
a1bb021469
|
am 96fcb702: am b40e85f9: am 645434fb: Merge "Fix a leak in RefBase" into honeycomb-mr2
* commit '96fcb702d75dcfb36c3ebd8fe420c8b29fa67fb7':
Fix a leak in RefBase
|
2011-06-09 13:54:54 -07:00 |
|
Adam Powell
|
795a715178
|
Merge "resolved conflicts for merge of fb339016 to master"
|
2011-06-09 13:16:50 -07:00 |
|
Brian Carlstrom
|
a6d34641a4
|
Merge "Implement android.webkit.BrowserFrame.requestClientCert"
|
2011-06-09 12:36:54 -07:00 |
|
Adam Powell
|
1529e14fd2
|
resolved conflicts for merge of fb339016 to master
Change-Id: I4ffa0bb8809fa5f99feced9e243df4efa6ac00ac
|
2011-06-09 12:15:10 -07:00 |
|
Wink Saville
|
4cc6156566
|
am 2d8500d2: am 799f04c0: Merge "Report data status from ApnContext even if data is detached" into honeycomb-LTE
* commit '2d8500d21a3fe6af36040a5dcd0599e00a242766':
Report data status from ApnContext even if data is detached
|
2011-06-09 11:58:28 -07:00 |
|
Wink Saville
|
d9ff509b5a
|
am a384ff32: am 33e1424b: Merge "Use CSIM to get provision information" into honeycomb-LTE
* commit 'a384ff32827cf6383ead48ec4e0da42365ed3584':
Use CSIM to get provision information
|
2011-06-09 11:58:16 -07:00 |
|
Jean-Baptiste Queru
|
6d2dc4779a
|
am ed17165a: am 0315a2c5: (-s ours) am f3894a04: Merge "Tweak setViewport stuff for fwd-compat"
* commit 'ed17165a14e20ab5110be8c86ec1b519835613d0':
Tweak setViewport stuff for fwd-compat
|
2011-06-09 11:56:34 -07:00 |
|
John Wang
|
eb68e8bf07
|
am 1861225b: (-s ours) am fe682fd7: am cea03df2: Do not merge. Return null id for Non-phone device.
* commit '1861225be3c848fdf395f7aa815c673af4239011':
Do not merge. Return null id for Non-phone device.
|
2011-06-09 11:56:28 -07:00 |
|
Jeff Brown
|
4d42d9dc35
|
am 92110af2: am 5f0b1721: am 25bd8abc: Merge "Fix swipe gesture cosine calculation. Bug: 4124987" into honeycomb-mr2
* commit '92110af24a9a93b73264560b57f55f45ec65dab5':
Fix swipe gesture cosine calculation. Bug: 4124987
|
2011-06-09 11:56:21 -07:00 |
|
Wink Saville
|
539f1f687b
|
am 0da86d4f: am a558fdf1: Merge "Fix default preferred network." into honeycomb-LTE
* commit '0da86d4fef70f94a02a504f8500df2833719da6b':
Fix default preferred network.
|
2011-06-09 11:55:30 -07:00 |
|
Dave Santoro
|
77715554b3
|
Merge "API modifications to handle profiles in Contacts."
|
2011-06-09 11:46:43 -07:00 |
|
Adam Powell
|
cba24f03c0
|
Merge "Bug 4588114 - Make GestureDetector behave nicer with parallel multi-touch detection"
|
2011-06-09 11:43:19 -07:00 |
|