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

41707 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Queru
0df964696c am 64085d03: am 12045502: Merge "stagefright aacenc: Fix type definitions for 64 bit platforms" 
* commit '64085d03efcd2abf3b8cd64f4e6344a1ece014c3':
  stagefright aacenc: Fix type definitions for 64 bit platforms
 2012-01-25 10:30:31 -08:00
Jean-Baptiste Queru
105b4f71a9 am 12045502: Merge "stagefright aacenc: Fix type definitions for 64 bit platforms" 
* commit '12045502c49bfee40d7d3cb806d9b70d3b5d3ed3':
  stagefright aacenc: Fix type definitions for 64 bit platforms
 2012-01-25 10:27:41 -08:00
Jean-Baptiste Queru
a8ed1d4f9a Merge "stagefright aacenc: Fix type definitions for 64 bit platforms" 2012-01-25 09:17:46 -08:00
Roman Nurik
1767e74ae7 am cf077fdd: Merge "docs: Android Design typo and grammar fixes" into ics-mr1 
* commit 'cf077fdd79853dd4778598a623dc2f469c1a8934':
  docs: Android Design typo and grammar fixes
 2012-01-24 18:11:12 -08:00
Roman Nurik
1c4b467cf1 Merge "docs: Android Design typo and grammar fixes" into ics-mr1 2012-01-24 18:08:52 -08:00
Jean-Baptiste Queru
9364b5c01e am 4cd2b343: am 98539a4e: Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe" 
* commit '4cd2b343272429adae1fc68e0ec0628c69e88e6d':
  stagefright amrwbenc: Make the mem_malloc function 64-bit safe
 2012-01-24 15:15:36 -08:00
Jean-Baptiste Queru
0fb6ec284a am fc2ea24b: am d80cbb8c: Merge "stagefright aacenc: Add missing newlines at the end of files" 
* commit 'fc2ea24b024f7a015d67054adb7bb09ff3a0a97b':
  stagefright aacenc: Add missing newlines at the end of files
 2012-01-24 15:15:33 -08:00
Jean-Baptiste Queru
0e5f19af0c am 98539a4e: Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe" 
* commit '98539a4eba7677c0b1ddc12f800c7075851ef302':
  stagefright amrwbenc: Make the mem_malloc function 64-bit safe
 2012-01-24 15:13:45 -08:00
Jean-Baptiste Queru
2a92cabc90 am d80cbb8c: Merge "stagefright aacenc: Add missing newlines at the end of files" 
* commit 'd80cbb8c7b13203704c00e2f5941588811c15665':
  stagefright aacenc: Add missing newlines at the end of files
 2012-01-24 15:13:42 -08:00
Jean-Baptiste Queru
afcc5fa9df Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe" 2012-01-24 14:26:32 -08:00
Daniel Sandler
08c109508e am 185c0ef7: Merge "Stop showing "No internet connection" when there is one." into ics-mr1 
* commit '185c0ef7e4aaa4bb978a6eb5c93c569585a07f56':
  Stop showing "No internet connection" when there is one.
 2012-01-24 12:57:14 -08:00
Daniel Sandler
4ca203ab44 Merge "Stop showing "No internet connection" when there is one." into ics-mr1 2012-01-24 12:54:48 -08:00
Eric Laurent
321400743a am 7eeaf3f0: Merge "AudioFlinger: refine mixer sleep time logic" into ics-mr1 
* commit '7eeaf3f07aa6fb10639d9f96c1367eb98c3e8839':
  AudioFlinger: refine mixer sleep time logic
 2012-01-24 11:51:50 -08:00
Eric Laurent
e628319fd5 am 41773d46: Merge "DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""" into ics-mr1 
* commit '41773d46556aa47d4322ff89fdaf7d1345c2d1f2':
  DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""
 2012-01-24 11:51:47 -08:00
Eric Laurent
46ae3f752e Merge "AudioFlinger: refine mixer sleep time logic" into ics-mr1 2012-01-24 11:49:39 -08:00
Eric Laurent
95460d7cbc Merge "DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""" into ics-mr1 2012-01-24 11:49:16 -08:00
Robert Greenwalt
b945a6844b am f449ea9e: Merge "Use the carrier-given dns addrs for tethering." into ics-mr1 
* commit 'f449ea9e96162698f4ec6d62c70750eb50744da7':
  Use the carrier-given dns addrs for tethering.
 2012-01-24 11:42:21 -08:00
Robert Greenwalt
4d5a59c80d Merge "Use the carrier-given dns addrs for tethering." into ics-mr1 2012-01-24 11:40:19 -08:00
Dianne Hackborn
0877ec44ac am 47163685: Merge "Another attempt at issue #5823276: home repaints after full-screen app is exited" into ics-mr1 
* commit '47163685eb90f9520e7ae0ac0984b4e1535e8e5b':
  Another attempt at issue #5823276: home repaints after full-screen app is exited
 2012-01-24 11:37:02 -08:00
Dianne Hackborn
a4a2df7f69 am c986d6f0: Merge "Fix issue #5906017: Missing menu entries in portrait when in compatibility mode" into ics-mr1 
* commit 'c986d6f01b00dd760ba1650918baadd24a6dc838':
  Fix issue #5906017: Missing menu entries in portrait when in compatibility mode
 2012-01-24 11:34:49 -08:00
Daniel Sandler
9fb2e44d12 am a4474ae0: Merge "Detect and repair invalid layouts in the navigation bar." into ics-mr1 
* commit 'a4474ae02546d725686f9c08113c16a84aca912c':
  Detect and repair invalid layouts in the navigation bar.
 2012-01-24 11:34:47 -08:00
Dianne Hackborn
8ee6be57f1 Merge "Another attempt at issue #5823276: home repaints after full-screen app is exited" into ics-mr1 2012-01-24 11:33:15 -08:00
Dianne Hackborn
0545e6fcc8 Merge "Fix issue #5906017: Missing menu entries in portrait when in compatibility mode" into ics-mr1 2012-01-24 11:33:06 -08:00
Daniel Sandler
244d1b2cad Merge "Detect and repair invalid layouts in the navigation bar." into ics-mr1 2012-01-24 11:32:31 -08:00
Scott Main
67f1d5891e am 4809f09f: docs: update fujitsu id, capitalize 
* commit '4809f09f55a6177bd69303630dc42cc738f71116':
  docs: update fujitsu id, capitalize
 2012-01-24 11:01:49 -08:00
Scott Main
dac2f15d6a am cdf14454: docs: add fujitsu/toshiba USB vendor id 
* commit 'cdf14454326dcb2f43ae0da208a8ed65a38f2897':
  docs: add fujitsu/toshiba USB vendor id
 2012-01-24 10:59:23 -08:00
Jean-Baptiste Queru
86391d8791 Merge "stagefright aacenc: Add missing newlines at the end of files" 2012-01-24 10:34:25 -08:00
Jean-Baptiste Queru
7c21224b8c am 2ae5805c: am 164a9842: Merge "stagefright aacenc: Properly terminate a comment" 
* commit '2ae5805cf18ad6bdbea5def03a488e14c1a8804c':
  stagefright aacenc: Properly terminate a comment
 2012-01-24 08:43:14 -08:00
Jean-Baptiste Queru
c8c4c9b2c8 am 164a9842: Merge "stagefright aacenc: Properly terminate a comment" 
* commit '164a984224f5d430757628028f2522329987350f':
  stagefright aacenc: Properly terminate a comment
 2012-01-24 08:40:50 -08:00
Jean-Baptiste Queru
e5fb848d1f Merge "stagefright aacenc: Properly terminate a comment" 2012-01-24 07:51:12 -08:00
Jim Miller
5f7ea7c272 am 44760b10: Merge "Revert "Fix 5797764: Increase lock screen\'s thread priority"" into ics-mr1 
* commit '44760b106a4bafcf83fb356bf91683db40e0e5a2':
  Revert "Fix 5797764: Increase lock screen's thread priority"
 2012-01-23 15:51:23 -08:00
Jim Miller
666b06d8f4 Merge "Revert "Fix 5797764: Increase lock screen's thread priority"" into ics-mr1 2012-01-23 15:49:32 -08:00
Justin Ho
7ef6ae3b9b am fee5a860: Merge "DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"" into ics-mr1 
* commit 'fee5a860a8355cda071ff23644e943414ba7f65d':
  DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"
 2012-01-23 15:13:19 -08:00
Justin Ho
7ebc940ec5 Merge "DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"" into ics-mr1 2012-01-23 15:11:00 -08:00
Bill Gruber
3f92dbe932 am 5e5b57ae: Merge "DevDocs update: Publishing on Market" into ics-mr1 
* commit '5e5b57aef29b33d03965b4dc370cde9a39220adc':
  DevDocs update: Publishing on Market
 2012-01-23 10:23:10 -08:00
Bill Gruber
9432e6bfea Merge "DevDocs update: Publishing on Market" into ics-mr1 2012-01-23 10:21:16 -08:00
The Android Open Source Project
3b79d1b26e Reconcile with ics-mr1-release 
Change-Id: If1b58550b6ddf90a654f08e4add9012a15a7134a
 2012-01-23 10:15:41 -08:00
The Android Automerger
38418c2478 merge in ics-mr1-release history after reset to ics-mr1 2012-01-20 16:12:47 -08:00
Jim Miller
b618fe6b34 am eaa11a72: Merge "Fix 5797764: Increase lock screen\'s thread priority" into ics-mr1 
* commit 'eaa11a723150f1ea79446d7ba4bf77eb47b73337':
  Fix 5797764: Increase lock screen's thread priority
 2012-01-20 15:26:42 -08:00
Jim Miller
27e1118292 Merge "Fix 5797764: Increase lock screen's thread priority" into ics-mr1 2012-01-20 15:24:20 -08:00
Justin Ho
f22a3b9825 am b09f6f96: Merge "Update WiMAX assets to match new style Bug: 5724605" into ics-mr1 
* commit 'b09f6f96e3583da320b69486869bc98fd463735e':
  Update WiMAX assets to match new style Bug: 5724605
 2012-01-20 14:50:30 -08:00
Justin Ho
4989420b27 Merge "Update WiMAX assets to match new style Bug: 5724605" into ics-mr1 2012-01-20 14:48:51 -08:00
Daniel Sandler
aa6598472a am 639ed754: Hide mobile RSSI on devices without mobile data. 
* commit '639ed754bba866d2a47ef7ca58e56806b546b149':
  Hide mobile RSSI on devices without mobile data.
 2012-01-20 14:40:26 -08:00
Justin Ho
d814b614ef am 70e21c92: Merge "New out-of-service RSSI." into ics-mr1 
* commit '70e21c927afeff05d8f26e9df2f36785ca19fdfd':
  New out-of-service RSSI.
 2012-01-20 14:35:09 -08:00
Justin Ho
849c08b732 Merge "New out-of-service RSSI." into ics-mr1 2012-01-20 14:33:07 -08:00
Dianne Hackborn
98bd6e7708 am 1bae8066: Merge "Fix issue #5823276 again: home repaints after full-screen app is exited" into ics-mr1 
* commit '1bae80668cc1d12bb4a4b93bce1960b2601de131':
  Fix issue #5823276 again: home repaints after full-screen app is exited
 2012-01-20 12:03:47 -08:00
Dianne Hackborn
e2b2ee959a Merge "Fix issue #5823276 again: home repaints after full-screen app is exited" into ics-mr1 2012-01-20 12:01:51 -08:00
Daniel Sandler
798f073a62 am 4d3161f3: Merge "Always show appropriate mobile service label." into ics-mr1 
* commit '4d3161f379195302b720e120c5e6b65a0adfaf8c':
  Always show appropriate mobile service label.
 2012-01-20 11:31:10 -08:00
Daniel Sandler
cec0a8e6a4 Merge "Always show appropriate mobile service label." into ics-mr1 2012-01-20 11:28:44 -08:00
Jeff Brown
c15791f7c7 am ad1f4a2c: Merge "Implement a max time bound for rotation. (DO NOT MERGE)" into ics-mr1 
* commit 'ad1f4a2ca825b8524c6bed494a7cf3ca70ee7e28':
  Implement a max time bound for rotation.  (DO NOT MERGE)
 2012-01-20 11:26:46 -08:00