Robert Greenwalt
|
205c0b3f21
|
am 75612e9c: am 1ea549e8: Merge "CDMALTE: Get roaming status based on SID/NID" into honeycomb-LTE
* commit '75612e9c3f92364ba1f0a7fce46f1df11b0a14ca':
CDMALTE: Get roaming status based on SID/NID
|
2011-06-10 15:21:22 -07:00 |
|
John Reck
|
4827e4870f
|
Merge "Tweak snap settings"
|
2011-06-10 14:57:33 -07:00 |
|
Jean-Baptiste Queru
|
84ba716d00
|
Merge "Make AllAudio really include all audio"
|
2011-06-10 14:27:01 -07:00 |
|
Shimeng (Simon) Wang
|
1e9ce58b0e
|
Merge "Fix reflow for mobile sites."
|
2011-06-10 14:13:36 -07:00 |
|
Robert Greenwalt
|
7dfee1ed42
|
am 1ea549e8: Merge "CDMALTE: Get roaming status based on SID/NID" into honeycomb-LTE
* commit '1ea549e8990d2d73ccd9e92db1e7312423ee423e':
CDMALTE: Get roaming status based on SID/NID
|
2011-06-10 14:13:25 -07:00 |
|
Brian Carlstrom
|
68a681cc77
|
Merge "New KeyChain API for application access to keystore credentials"
|
2011-06-10 14:11:15 -07:00 |
|
Dianne Hackborn
|
3b6b5167d5
|
am 0a63ccc6: am 5624b793: am 2bb2d48f: Commit final (maybe) MR 2 API.
* commit '0a63ccc63b833e8034cc941bf55a6e2003037309':
Commit final (maybe) MR 2 API.
|
2011-06-10 14:08:49 -07:00 |
|
Dianne Hackborn
|
92e8360a3c
|
am 15e9d474: am 88748e6d: am d86302df: Quiet the log.
* commit '15e9d474d1033adbedc8632309df26c3d6dfaee3':
Quiet the log.
|
2011-06-10 14:08:45 -07:00 |
|
Dianne Hackborn
|
29ed997980
|
am f14dff12: am c6adfed6: am f795e9a8: Okay *now* really enforce the limit on non-public styles.
* commit 'f14dff1219d2a87340dccad657f666f5451d8c6e':
Okay *now* really enforce the limit on non-public styles.
|
2011-06-10 14:08:41 -07:00 |
|
Robert Greenwalt
|
d5ba54c47f
|
Merge "CDMALTE: Get roaming status based on SID/NID" into honeycomb-LTE
|
2011-06-10 14:08:28 -07:00 |
|
Nick Pelly
|
4186410216
|
Merge "NfcAdapter: Remove dead AIDL methods."
|
2011-06-10 13:55:36 -07:00 |
|
John Reck
|
59e5a68e44
|
Merge "Expose hook for crash backup"
|
2011-06-10 13:10:52 -07:00 |
|
Dianne Hackborn
|
d0e926d687
|
am 9980043e: am 820caf7b: am 8821ba86: Ummm... f*, stop breaking the build.
* commit '9980043e930f877c4cd066de2b3d57dce4fc926e':
Ummm... f*, stop breaking the build.
|
2011-06-10 13:00:41 -07:00 |
|
Dianne Hackborn
|
726393aff2
|
Merge "resolved conflicts for merge of f51ded0f to master"
|
2011-06-10 12:47:12 -07:00 |
|
Dianne Hackborn
|
66168d4bb4
|
resolved conflicts for merge of f51ded0f to master
Change-Id: Ida356524a68aeb2b9b0013dfbb6ab4bd11e616e2
|
2011-06-10 12:45:36 -07:00 |
|
Adam Powell
|
53df9ca28f
|
Merge "Fix some measurement/sizing with split action bars"
|
2011-06-10 11:59:03 -07:00 |
|
Philip Milne
|
a6eb679133
|
Merge "Optimise the way that indices are auto-allocated so that XML files can normally avoid using indices."
|
2011-06-10 11:54:39 -07:00 |
|
RoboErik
|
639f7c3480
|
Merge "Upgrade of Calendar db to 305"
|
2011-06-10 11:36:15 -07:00 |
|
Dan Morrill
|
7f5bbbd1d6
|
Merge "Adding config_alwaysUseCdmaRssi. The change that added this didn't make it to master do to a merge conflict oversight."
|
2011-06-10 11:01:48 -07:00 |
|
Chet Haase
|
afc8947d31
|
Merge "Change Property.set() to throw UnsupportedOperationException by default"
|
2011-06-10 10:58:26 -07:00 |
|
Robert Greenwalt
|
a024b1fd31
|
am 5a8455c3: am 75749ab1: Merge "Set locale based on SIM preferred language." into honeycomb-LTE
* commit '5a8455c3c625201f3ae6b9ce32913bf97ba61cc8':
Set locale based on SIM preferred language.
|
2011-06-10 10:33:23 -07:00 |
|
James Dong
|
7abe46bd9f
|
am dc03da04: (-s ours) am 2488a943: am e3b80c83: Merge "Revert "Add avg bandwidth estimate every 2 seconds - do not merge."" into honeycomb-mr2
* commit 'dc03da0444803983aef4988475f2d5dcdf0283e9':
Revert "Add avg bandwidth estimate every 2 seconds - do not merge."
|
2011-06-10 10:32:21 -07:00 |
|
Mike Lockwood
|
6628fde552
|
am 6d60190a: am e502c536: am b3174c46: UsbService: Fix JNI reference leak
* commit '6d60190a3156e0ac69c800bbb10691b70ae9bd54':
UsbService: Fix JNI reference leak
|
2011-06-10 10:32:16 -07:00 |
|
Justin Ho
|
66963de1bc
|
am e9f203e4: am 9b0a8f9a: am 1d3173c3: Merge "Updating default wallpaper of large devices to match xlarge" into honeycomb-mr2
* commit 'e9f203e44363f0ee035aa2cd6aad3d5680e6c94f':
Updating default wallpaper of large devices to match xlarge
|
2011-06-10 10:32:10 -07:00 |
|
Xavier Ducrohet
|
c20d4c1589
|
am 48305f32: am 2e0f7118: am 8ee28811: Merge changes Idbb70f53,I10426a3f into honeycomb-mr2
* commit '48305f327ff3839ddbfa5a6fb42a57150a69480c':
Merge 06942bc4 from hc-mr1.
Merge 988eeeb5 from hc-mr1.
|
2011-06-10 10:31:52 -07:00 |
|
Conley Owens
|
6bea5574fb
|
am e668c0b6: (-s ours) am 644f36ea: am d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style"
* commit 'e668c0b69896996040f394e0a95f71dd4b9c6257':
stagefright aacenc/amrwbenc: Convert line breaks to Unix style
|
2011-06-10 10:30:38 -07:00 |
|
Ben Komalo
|
dc22fa852d
|
Merge "New device policy to disable camera."
|
2011-06-10 10:17:34 -07:00 |
|
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 |
|
Dianne Hackborn
|
5ab93c6372
|
am 5624b793: am 2bb2d48f: Commit final (maybe) MR 2 API.
* commit '5624b793cb791621a586931d9f02eefdf6cfc7c8':
Commit final (maybe) MR 2 API.
|
2011-06-10 07:46:51 -07:00 |
|
Dianne Hackborn
|
3a7df501da
|
am 88748e6d: am d86302df: Quiet the log.
* commit '88748e6dc0151916f6bd19ffde8ba96fe8fd0a87':
Quiet the log.
|
2011-06-10 07:46:27 -07:00 |
|
Dianne Hackborn
|
467d9dff62
|
am c6adfed6: am f795e9a8: Okay *now* really enforce the limit on non-public styles.
* commit 'c6adfed6dcea8482e482db58bd396ea8de08426a':
Okay *now* really enforce the limit on non-public styles.
|
2011-06-10 07:45:38 -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 |
|
Dianne Hackborn
|
fdc0e25f36
|
am 2bb2d48f: Commit final (maybe) MR 2 API.
* commit '2bb2d48f9ca1726b8de957ec7ea321c767409c12':
Commit final (maybe) MR 2 API.
|
2011-06-09 19:26:25 -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 |
|