ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity
41,648 Commits 2 Branches 0 Tags 54 MiB
64efe6e47a
Commit Graph

41648 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bart Sears
e2917428e2 am b56076ac: Merge "Fix WebTextView rings" into ics-mr1 
* commit 'b56076ac9f5ece5995363952e85d6dd8e4620e27':
  Fix WebTextView rings
 2011-12-07 11:43:54 -08:00
Bart Sears
162fa3da8d Merge "Fix WebTextView rings" into ics-mr1 2011-12-07 11:41:57 -08:00
Joe Malin
2c89bbb22a am 3744d1fa: am 9e2cf49f: Merge "DOC CHANGE: Add Content URI ref doc" into ics-mr0 
* commit '3744d1faf582214132b9ba000d54cdbf44425113':
  DOC CHANGE: Add Content URI ref doc
 2011-12-07 11:30:41 -08:00
Joe Malin
a457633b3f am 9e2cf49f: Merge "DOC CHANGE: Add Content URI ref doc" into ics-mr0 
* commit '9e2cf49fa360e70b33a870e9ae0b3eec11752972':
  DOC CHANGE: Add Content URI ref doc
 2011-12-07 11:28:25 -08:00
Joe Malin
62fecd5066 Merge "DOC CHANGE: Add Content URI ref doc" into ics-mr0 2011-12-07 11:26:20 -08:00
Dianne Hackborn
47d15b157f am fb90df8c: Merge "Truthiness is good." into ics-mr1 
* commit 'fb90df8c6e6d48c4b6701014a3053915b94f4b9e':
  Truthiness is good.
 2011-12-07 10:36:54 -08:00
Dianne Hackborn
aadc681f50 Merge "Truthiness is good." into ics-mr1 2011-12-07 10:33:19 -08:00
The Android Open Source Project
8abaab91b2 am 3de8d36b: Reconcile with ics-mr0-release 
* commit '3de8d36b6fd166cf63ca256c455c0ea26a849668':
  DO NOT MERGE: Remove the AVI extractor.
  Disable wifiwatchdog for now
 2011-12-07 07:27:57 -08:00
The Android Open Source Project
9e86a344c1 Reconcile with ics-mr0-release 
Change-Id: I5341d7d7de8ec8dfa86095e8d8d45a912bb01a47
 2011-12-07 07:24:54 -08:00
Irfan Sheriff
6f2e64fcf1 am 8a4cd3b1: Merge "Disable poor network connection alone" into ics-mr1 
* commit '8a4cd3b1053d92ecb34628218f303343746691f4':
  Disable poor network connection alone
 2011-12-06 21:07:36 -08:00
Irfan Sheriff
17d23095d2 Merge "Disable poor network connection alone" into ics-mr1 2011-12-06 21:06:03 -08:00
Scott Main
653598534c am 0a83e9d4: am b6322a5b: docs: fix broken links bug: 5542371 
* commit '0a83e9d438f35cba62a10392fb9e7e1c577aa638':
  docs: fix broken links bug: 5542371
 2011-12-06 17:14:50 -08:00
Scott Main
f0eac29469 am b6322a5b: docs: fix broken links bug: 5542371 
* commit 'b6322a5bb9fda370cccf89434b939370dfa36b02':
  docs: fix broken links bug: 5542371
 2011-12-06 17:12:53 -08:00
The Android Automerger
78bfa13ffc merge in ics-mr1-release history after reset to ics-mr1 2011-12-06 16:54:17 -08:00
Andreas Huber
7419051ce0 am 791a3183: Merge "Merge commit \'babb7200\' into manualmerge" into ics-mr1 
* commit '791a31832ab586f056c2bcab8e0515d4bb1e2f7a':
  DO NOT MERGE: Remove the AVI extractor.
 2011-12-06 16:22:07 -08:00
Andreas Huber
0c62c3799e Merge "Merge commit 'babb7200' into manualmerge" into ics-mr1 2011-12-06 16:20:01 -08:00
Fabrice Di Meglio
852ef84d0a am 1e994211: Merge "Fix TextLayoutCache issue when loading Font tables (DO NOT MERGE)" into ics-mr1 
* commit '1e99421196c1b34363267d6e6f02b16a299c9012':
  Fix TextLayoutCache issue when loading Font tables (DO NOT MERGE)
 2011-12-06 15:49:29 -08:00
Fabrice Di Meglio
662eb58742 Merge "Fix TextLayoutCache issue when loading Font tables (DO NOT MERGE)" into ics-mr1 2011-12-06 15:47:27 -08:00
Hong Teng
68149c7683 am 6db79c35: Merge "Fix for issue 5712743 video editor functional test : testPreviewDuringExport fails -Correct the invalid filename, which contains control character. And with the invalid filename, the cts fails only on crespo, but passes on stingray and prime." int 
* commit '6db79c35c0cb4e26c6aff4a913777fd21069fd3c':
  Fix for issue 5712743 video editor functional test : testPreviewDuringExport fails -Correct the invalid filename, which contains control character.  And with the invalid filename, the cts fails only on crespo, but passes on stingray and prime.
 2011-12-06 15:39:37 -08:00
Amith Yamasani
e4a4db8236 am f3364080: Merge "New and improved silent mode on lockscreen." into ics-mr1 
* commit 'f336408000c4be36045401fb4df89528249e7383':
  New and improved silent mode on lockscreen.
 2011-12-06 15:37:31 -08:00
Hong Teng
862884d205 Merge "Fix for issue 5712743 video editor functional test : testPreviewDuringExport fails -Correct the invalid filename, which contains control character. And with the invalid filename, the cts fails only on crespo, but passes on stingray and prime." into ics-mr1 2011-12-06 15:37:25 -08:00
Amith Yamasani
3dbdd8f5e4 Merge "New and improved silent mode on lockscreen." into ics-mr1 2011-12-06 15:36:10 -08:00
Andreas Huber
325e028e16 Merge commit 'babb7200' into manualmerge 2011-12-06 15:03:10 -08:00
Adam Powell
bdfa931022 am 720efc43: Merge "Lower touch slop in ViewConfiguration." into ics-mr1 
* commit '720efc43d89ce9fd50b66f22cdb1bb4363cfb291':
  Lower touch slop in ViewConfiguration.
 2011-12-06 14:00:18 -08:00
Adam Powell
6e5c8b6b4f Merge "Lower touch slop in ViewConfiguration." into ics-mr1 2011-12-06 13:58:20 -08:00
James Dong
e3c80aafbf am 6b8b5a0a: Merge "DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames" into ics-mr1 
* commit '6b8b5a0a4183c0f8d1d5ceacc9e50194589a77d3':
  DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames
 2011-12-06 12:55:39 -08:00
James Dong
102c083007 Merge "DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames" into ics-mr1 2011-12-06 12:52:52 -08:00
Andreas Huber
fbf277811b am 05d63069: Merge "DO NOT MERGE: Remove the AVI extractor." into ics-mr1 
* commit '05d630691127c022befd071b2bede87c707112a9':
  DO NOT MERGE: Remove the AVI extractor.
 2011-12-06 12:46:46 -08:00
Andreas Huber
047dc0fd96 Merge "DO NOT MERGE: Remove the AVI extractor." into ics-mr1 2011-12-06 12:44:53 -08:00
Andreas Huber
6ac5344822 Merge "DO NOT MERGE: Remove the AVI extractor." into ics-mr0 2011-12-06 12:11:38 -08:00
Irfan Sheriff
aa68c19731 am 40cb30c2: am 7b62313e: Disable wifiwatchdog for now 
* commit '40cb30c2df2176c03f24cbdc194e3af5a4f64758':
  Disable wifiwatchdog for now
 2011-12-06 11:37:40 -08:00
Irfan Sheriff
e2f918580a am 7b62313e: Disable wifiwatchdog for now 
* commit '7b62313eab4af8835a64fb3fe1e15e5e534a9479':
  Disable wifiwatchdog for now
 2011-12-06 11:34:58 -08:00
Gilles Debunne
520e598f56 am 98a85c2d: Merge "Invalidated bounds tightened in TextView" into ics-mr1 
* commit '98a85c2de6b3f27ba1ccb2cfd44a775b4f490f72':
  Invalidated bounds tightened in TextView
 2011-12-06 11:22:19 -08:00
Gilles Debunne
1e41509302 Merge "Invalidated bounds tightened in TextView" into ics-mr1 2011-12-06 11:20:18 -08:00
Eric Fischer
90193fb81e am 58ad16cf: Merge "Import revised translations. DO NOT MERGE" into ics-mr1 
* commit '58ad16cfeaac1c2124d0f9e9d2b5c493e163128c':
  Import revised translations.  DO NOT MERGE
 2011-12-06 10:36:30 -08:00
Eric Fischer
36a9a06f12 Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-12-06 10:34:41 -08:00
Svetoslav Ganov
618a136015 am ea25ea7e: Merge "Adding a system preference whether to speak passwords in accessibility mode." into ics-mr1 
* commit 'ea25ea7ef30be14dd940f1667e0308bfff5b4d85':
  Adding a system preference whether to speak passwords in accessibility mode.
 2011-12-06 10:29:13 -08:00
Svetoslav Ganov
d10d9b0c05 Merge "Adding a system preference whether to speak passwords in accessibility mode." into ics-mr1 2011-12-06 10:27:04 -08:00
Jeff Brown
c18c2b28f9 am 4079702a: Merge "Fix memory corruption issues in TextLayoutCache. (DO NOT MERGE)" into ics-mr1 
* commit '4079702ac27b51282a25de5f7c20f6fba6b71995':
  Fix memory corruption issues in TextLayoutCache.  (DO NOT MERGE)
 2011-12-05 22:52:20 -08:00
Jeff Brown
3e22f421dc Merge "Fix memory corruption issues in TextLayoutCache. (DO NOT MERGE)" into ics-mr1 2011-12-05 22:50:49 -08:00
Jim Miller
74015225ec am 17f9fe13: Merge "Fix 5705837: Dismiss keyguard when launching Settings from Statusbar" into ics-mr1 
* commit '17f9fe13c7c78eaab521f6f85b48b0e8f5adddbc':
  Fix 5705837: Dismiss keyguard when launching Settings from Statusbar
 2011-12-05 22:14:37 -08:00
Jim Miller
a389059345 Merge "Fix 5705837: Dismiss keyguard when launching Settings from Statusbar" into ics-mr1 2011-12-05 22:12:54 -08:00
Jesse Hall
4759837dd3 am 3e7b412d: Merge "Fix statusbar crash on devices with no Bluetooth" into ics-mr1 
* commit '3e7b412d7d6332830ceaf123edb5e211757c69ce':
  Fix statusbar crash on devices with no Bluetooth
 2011-12-05 21:24:53 -08:00
Jesse Hall
ed7d42a38c Merge "Fix statusbar crash on devices with no Bluetooth" into ics-mr1 2011-12-05 21:23:29 -08:00
The Android Automerger
201a78f702 merge in ics-mr1-release history after reset to ics-mr1 2011-12-05 20:36:01 -08:00
Matthew Xie
5f2dca5822 am 0d9a41e7: Merge "Broadcast turning on/off intent as early as possible when switch on/off BT" into ics-mr1 
* commit '0d9a41e74c81e8297ee439473c301a50da20cf0b':
  Broadcast turning on/off intent as early as possible when switch on/off BT
 2011-12-05 19:58:12 -08:00
Matthew Xie
7f87a886c2 Merge "Broadcast turning on/off intent as early as possible when switch on/off BT" into ics-mr1 2011-12-05 19:56:54 -08:00
Dianne Hackborn
4e6a13e794 am 0c0120ef: Merge "Fix issue #5714517: App shortcuts can result in bad task intents" into ics-mr1 
* commit '0c0120efa2dedaf25ae789bced5a3f9fa33c32bb':
  Fix issue #5714517: App shortcuts can result in bad task intents
 2011-12-05 19:18:34 -08:00
Dianne Hackborn
de63dc278a Merge "Fix issue #5714517: App shortcuts can result in bad task intents" into ics-mr1 2011-12-05 19:16:54 -08:00
Dianne Hackborn
6d28bf7b30 am 52245ac7: Merge "Fix issue #5713576: Home redraws after returning from app on Nexus S 4G" into ics-mr1 
* commit '52245ac7c41735c561199d9ec7e9577d592ca852':
  Fix issue #5713576: Home redraws after returning from app on Nexus S 4G
 2011-12-05 19:09:17 -08:00