ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 8 Pull Requests Releases Wiki Activity
41,476 Commits 2 Branches 0 Tags 54 MiB
8f75161dbf
Commit Graph

41476 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Malin
a9f2453392 am 3937e055: Merge "DOC CHANGE: Add text for android.os.storage" into ics-mr0 
* commit '3937e055708a8618f184feab204fed4bb41f3f6e':
  DOC CHANGE: Add text for android.os.storage
 2011-12-07 17:11:59 -08:00
Dianne Hackborn
7fb0eb9d1f am b32785c6: Merge "More fixing for issue #5366535: Lockscreen has wrong layout..." into ics-mr0 
* commit 'b32785c6e893743956e28b285b8e6f6fc7aa8edb':
  More fixing for issue #5366535: Lockscreen has wrong layout...
 2011-12-07 17:11:57 -08:00
Robert Greenwalt
fb47bd574d am fbb09ea8: Merge "Fix NPE in trimV4AddrZeros." into ics-mr1 
* commit 'fbb09ea84f7a9df94358f05f4e680cb363bae663':
  Fix NPE in trimV4AddrZeros.
 2011-12-07 17:10:37 -08:00
Dianne Hackborn
ee2a8be8b4 Merge "Merge commit 'eee12419' into manualmerge" into ics-mr1 2011-12-07 17:10:34 -08:00
Robert Greenwalt
52744cedeb Merge "Fix NPE in trimV4AddrZeros." into ics-mr1 2011-12-07 17:09:05 -08:00
Amith Yamasani
79bc446263 am 3b5555fc: Merge "Make new ringer toggles on power menu accessible and navigable with keyboard." into ics-mr1 
* commit '3b5555fc4483f6813f3df4787d98dd5357851566':
  Make new ringer toggles on power menu accessible and navigable with keyboard.
 2011-12-07 16:56:17 -08:00
Amith Yamasani
2f2278a0d2 Merge "Make new ringer toggles on power menu accessible and navigable with keyboard." into ics-mr1 2011-12-07 16:54:31 -08:00
Daniel Sandler
c3f9c1648e am dc8cb9aa: Merge "Invalidate the whole status bar after layout transitions." into ics-mr1 
* commit 'dc8cb9aa7e8f341ab88ae57e9d2cb99502844e5b':
  Invalidate the whole status bar after layout transitions.
 2011-12-07 16:35:46 -08:00
Daniel Sandler
43d6c73063 Merge "Invalidate the whole status bar after layout transitions." into ics-mr1 2011-12-07 16:33:31 -08:00
Dianne Hackborn
6be8470096 Merge commit 'eee12419' into manualmerge 2011-12-07 16:33:15 -08:00
Russell Brenner
7cbc7533de am 1662a874: Merge "Update Armenian and Georgian fonts" into ics-mr1 
* commit '1662a874fb65b915b6c3d8a213c1bd0c718059b5':
  Update Armenian and Georgian fonts
 2011-12-07 16:22:24 -08:00
Russell Brenner
2952c4e0bb Merge "Update Armenian and Georgian fonts" into ics-mr1 2011-12-07 16:20:15 -08:00
Joe Malin
7cb74e25f7 Merge "DOC CHANGE: Add text for android.os.storage" into ics-mr0 2011-12-07 16:07:49 -08:00
Jeff Brown
7672b11588 am ff3b5a82: Merge "Make the dock orientation override the HDMI orientation." into ics-mr1 
* commit 'ff3b5a828ea1f7409af4475898689804bed10ede':
  Make the dock orientation override the HDMI orientation.
 2011-12-07 16:03:57 -08:00
Dianne Hackborn
f73c9820a6 am 87e06ec2: Merge "Fix issue #5144065: Tap on Music icon from Home screen..." into ics-mr1 
* commit '87e06ec2fa57a54b92fe82f2cacfbf8a44e47baf':
  Fix issue #5144065: Tap on Music icon from Home screen...
 2011-12-07 16:03:56 -08:00
Dianne Hackborn
0969ff1b17 Merge "More fixing for issue #5366535: Lockscreen has wrong layout..." into ics-mr0 2011-12-07 15:22:21 -08:00
Jeff Brown
a33dec75f3 Merge "Make the dock orientation override the HDMI orientation." into ics-mr1 2011-12-07 15:04:39 -08:00
Dianne Hackborn
e26381bce5 Merge "Fix issue #5144065: Tap on Music icon from Home screen..." into ics-mr1 2011-12-07 15:01:55 -08:00
Dianne Hackborn
7c3885169d Merge "DO NOT MERGE. Integrate from MR 1 to fix issue #5366535: Lockscreen..." into ics-mr0 2011-12-07 15:00:05 -08:00
Winson Chung
e916ce4a6d am 0a361b10: Merge "Workaround for issue where the notifyDatasetChanged call chain is broken when Launcher is killed. (Bug 5703782)" into ics-mr1 
* commit '0a361b10a665a3d158c846722290f26ce62276e1':
  Workaround for issue where the notifyDatasetChanged call chain is broken when Launcher is killed. (Bug 5703782)
 2011-12-07 14:35:04 -08:00
Winson Chung
e2fe012e3d Merge "Workaround for issue where the notifyDatasetChanged call chain is broken when Launcher is killed. (Bug 5703782)" into ics-mr1 2011-12-07 14:33:31 -08:00
Dave Burke
fafc6864e2 am 54a53841: Merge "Fetch at least 192KB to avoid our mp3 sniffer from blocking on data." into ics-mr1 
* commit '54a53841a9ff48ba4cd004469ae4ff77caed900a':
  Fetch at least 192KB to avoid our mp3 sniffer from blocking on data.
 2011-12-07 14:08:13 -08:00
Dave Burke
d59a3673c9 Merge "Fetch at least 192KB to avoid our mp3 sniffer from blocking on data." into ics-mr1 2011-12-07 14:05:41 -08:00
Robert Greenwalt
9471812292 am 3957b5fc: Fix the build. 
* commit '3957b5fc49335f13b15080b8e7146580026c0479':
  Fix the build.
 2011-12-07 13:17:04 -08:00
Robert Greenwalt
8a67914636 am f352491a: Merge "Trim leading zeros from ipv4 addrs." into ics-mr1 
* commit 'f352491aad71b5c0a30238707bdb83c9dc34fd9e':
  Trim leading zeros from ipv4 addrs.
 2011-12-07 12:31:11 -08:00
Robert Greenwalt
2c43067b5c Merge "Trim leading zeros from ipv4 addrs." into ics-mr1 2011-12-07 12:29:14 -08:00
Irfan Sheriff
a62cec7696 am a85cc282: Merge "Fix CS wakelock handling" into ics-mr1 
* commit 'a85cc28229c2d5114fcc83c3d7ebfd6894fd4b98':
  Fix CS wakelock handling
 2011-12-07 12:08:41 -08:00
Irfan Sheriff
d8e3949849 Merge "Fix CS wakelock handling" into ics-mr1 2011-12-07 12:06:31 -08:00
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