The Android Open Source Project
|
de973467d4
|
Reconcile with ics-mr1-release
Change-Id: Ic6454a4b7929bbf2f453022fd8ae596e215657c2
|
2012-01-30 13:36:34 -08:00 |
|
The Android Automerger
|
14ccfc4a72
|
merge in ics-mr1-release history after reset to ics-mr1
|
2012-01-30 13:23:32 -08:00 |
|
Dianne Hackborn
|
128fe3141e
|
am e22f4748: Merge "Update documentation to reflect the old approach not working." into ics-mr1
* commit 'e22f4748565915948c8af2961ac74fe81a417e3b':
Update documentation to reflect the old approach not working.
|
2012-01-30 12:54:02 -08:00 |
|
Dianne Hackborn
|
2e6f082987
|
Merge "Update documentation to reflect the old approach not working." into ics-mr1
|
2012-01-30 12:52:11 -08:00 |
|
John Wang
|
e97d8f554d
|
am b069833e: Merge "Adjust the LTE signal bar mapping." into ics-mr1
* commit 'b069833e63f711a6b140385003d67b3ff68fe66b':
Adjust the LTE signal bar mapping.
|
2012-01-30 11:23:24 -08:00 |
|
John Wang
|
a493ce1366
|
Merge "Adjust the LTE signal bar mapping." into ics-mr1
|
2012-01-30 11:20:35 -08:00 |
|
Scott Main
|
33a92006e1
|
am 73790a53: Merge "docs: add G+ page announcement to homepage" into ics-mr1
* commit '73790a53b580b8ec8eff88e25a19b5fcfa33392a':
docs: add G+ page announcement to homepage
|
2012-01-30 10:05:59 -08:00 |
|
Scott Main
|
b11ef47140
|
Merge "docs: add G+ page announcement to homepage" into ics-mr1
|
2012-01-30 10:03:21 -08:00 |
|
Jean-Baptiste Queru
|
de0c247336
|
am dc8668c8: am 97818704: Merge "Wi-Fi: Handle disconnect in middle of DHCP operation"
* commit 'dc8668c8a727a065cbe48c89c900d2fe98e12ab3':
Wi-Fi: Handle disconnect in middle of DHCP operation
|
2012-01-27 13:58:03 -08:00 |
|
Jean-Baptiste Queru
|
f08d07d93f
|
am 97818704: Merge "Wi-Fi: Handle disconnect in middle of DHCP operation"
* commit '9781870491f4f33403f8d518879a88c20180d7cb':
Wi-Fi: Handle disconnect in middle of DHCP operation
|
2012-01-27 13:55:56 -08:00 |
|
Jean-Baptiste Queru
|
2bc69de766
|
Merge "Wi-Fi: Handle disconnect in middle of DHCP operation"
|
2012-01-27 13:36:49 -08:00 |
|
The Android Automerger
|
e093eabe76
|
merge in ics-mr1-release history after reset to ics-mr1
|
2012-01-26 18:32:07 -08:00 |
|
Roman Nurik
|
94a7d3f291
|
am 639b25ea: Merge "docs: add NOTICE to action bar icon pack and sprinkle download links" into ics-mr1
* commit '639b25ea289481da6cfd4229649b51ffc6ce3406':
docs: add NOTICE to action bar icon pack and sprinkle download links
|
2012-01-26 16:35:06 -08:00 |
|
Roman Nurik
|
716fa3cdcd
|
Merge "docs: add NOTICE to action bar icon pack and sprinkle download links" into ics-mr1
|
2012-01-26 16:32:56 -08:00 |
|
Roman Nurik
|
953dce0764
|
am 00b3ceb4: Merge "docs: Update designing-navigation training class to link to Android Design" into ics-mr1
* commit '00b3ceb48b5e23daa8101db6080bee46d6518f43':
docs: Update designing-navigation training class to link to Android Design
|
2012-01-26 15:35:46 -08:00 |
|
Roman Nurik
|
4f237b4ce6
|
Merge "docs: Update designing-navigation training class to link to Android Design" into ics-mr1
|
2012-01-26 15:33:57 -08:00 |
|
Daniel Sandler
|
9604fdcf94
|
am 5b08738a: Merge "Suppress mobile-out-of-service label if wifi connected." into ics-mr1
* commit '5b08738a62ece5bf0ca5d22a6f062e2fb67af272':
Suppress mobile-out-of-service label if wifi connected.
|
2012-01-26 13:04:17 -08:00 |
|
Daniel Sandler
|
e84ea3722f
|
Merge "Suppress mobile-out-of-service label if wifi connected." into ics-mr1
|
2012-01-26 13:02:32 -08:00 |
|
Scott Main
|
9912602489
|
am 6c055bbd: docs: add action bar icons ZIP
* commit '6c055bbdf475e6cd324912326c802244b9a76c3b':
docs: add action bar icons ZIP
|
2012-01-26 11:44:58 -08:00 |
|
Scott Main
|
9fb836c3f8
|
am 9ac4dd82: Merge "docs: remove the 1.0 icon template pack" into ics-mr1
* commit '9ac4dd828065410efbb380992d996c7e93daf437':
docs: remove the 1.0 icon template pack
|
2012-01-25 18:00:42 -08:00 |
|
Scott Main
|
278a730b83
|
Merge "docs: remove the 1.0 icon template pack" into ics-mr1
|
2012-01-25 17:58:54 -08:00 |
|
Scott Main
|
a4fda50a92
|
am f466db14: Merge "docs: remove ADL presentation PDFs to conserve site space" into ics-mr1
* commit 'f466db14ec32fbaf08a868df40f7685a7e7df3db':
docs: remove ADL presentation PDFs to conserve site space
|
2012-01-25 17:52:08 -08:00 |
|
Scott Main
|
25120a84bb
|
Merge "docs: remove ADL presentation PDFs to conserve site space" into ics-mr1
|
2012-01-25 17:50:20 -08:00 |
|
Joe Malin
|
941e34e3aa
|
am 9f426604: am a2a46f62: DOC CHANGE: New Content Provider topics
* commit '9f426604e6f21e31f8a2194dcff0ea7bf488eee2':
DOC CHANGE: New Content Provider topics
|
2012-01-25 17:30:13 -08:00 |
|
Joe Malin
|
0d9aecbbd8
|
am a2a46f62: DOC CHANGE: New Content Provider topics
* commit 'a2a46f629446af0935e8ebbbd7cdb55e395f79f3':
DOC CHANGE: New Content Provider topics
|
2012-01-25 17:27:46 -08:00 |
|
The Android Automerger
|
78d8cd87fa
|
merge in ics-mr1-release history after reset to ics-mr1
|
2012-01-25 12:08:57 -08:00 |
|
Robert Greenwalt
|
424661c12a
|
am 44f64c96: Merge "Filter our v6 address from tethering dns." into ics-mr1
* commit '44f64c965776ae65ff85ef8c37afb7e14483bdf2':
Filter our v6 address from tethering dns.
|
2012-01-25 11:30:39 -08:00 |
|
Robert Greenwalt
|
fa00205ed3
|
Merge "Filter our v6 address from tethering dns." into ics-mr1
|
2012-01-25 11:28:30 -08:00 |
|
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 |
|
The Android Automerger
|
cdb6de20ee
|
merge in ics-mr1-release history after reset to ics-mr1
|
2012-01-24 13:33:01 -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 |
|