Scott Main
21e32f2097
am 8bfeb10f: Merge "docs: fix typo in market doc external issue 22650" into ics-mr1
...
* commit '8bfeb10f98125706d8bb7afa1067ca563e741540':
docs: fix typo in market doc external issue 22650
2012-01-31 08:41:01 -08:00
Scott Main
20d06540e2
am 4b2eb9a5: Merge "docs: fix typos and clarify some grammar in summary external issue 21548" into ics-mr1
...
* commit '4b2eb9a50bbead0b756944ebffd01c89916896ad':
docs: fix typos and clarify some grammar in summary external issue 21548
2012-01-31 08:40:59 -08:00
Scott Main
34260ad79e
Merge "docs: fix locale name; South Africa is local en_ZA external issue 23133" into ics-mr1
2012-01-31 08:39:36 -08:00
Scott Main
8bfeb10f98
Merge "docs: fix typo in market doc external issue 22650" into ics-mr1
2012-01-31 08:39:03 -08:00
Scott Main
665a6693f7
am b86cba15: docs: fix typo in eclipse doc external issue 21475
...
* commit 'b86cba156c78740793d94444e01d17ef21cb53cc':
docs: fix typo in eclipse doc external issue 21475
2012-01-31 08:38:49 -08:00
Scott Main
4b2eb9a50b
Merge "docs: fix typos and clarify some grammar in summary external issue 21548" into ics-mr1
2012-01-31 08:37:59 -08:00
Scott Main
b86cba156c
docs: fix typo in eclipse doc
...
external issue 21475
Change-Id: I5aeee5710175964e2cf969965c7ed58c01f0e433
2012-01-30 23:56:53 -08:00
Scott Main
6440534660
docs: fix typos and clarify some grammar in summary
...
external issue 21548
Change-Id: Ic38921cb64390b42651f3971efeb4b76101dfc14
2012-01-30 23:49:26 -08:00
Scott Main
5b259c6e4d
docs: fix typo in market doc
...
external issue 22650
Change-Id: I2bbfddef4692cb6b7567ea3ab04443a6ac421a80
2012-01-30 23:39:45 -08:00
The Android Automerger
bc98b2a000
merge in ics-mr1-release history after reset to ics-mr1
2012-01-30 23:33:37 -08:00
Scott Main
b16965cf65
docs: fix locale name; South Africa is local en_ZA
...
external issue 23133
Change-Id: Ia17f61e6a4e14506aec5491db0c3fc65707f2c2b
2012-01-30 23:33:01 -08:00
Scott Main
6e4f886db0
am b2d37b39: Merge "docs: update sidenav to use <span> instead of <h2> for headings, under suspicion that the h2s are causing poor snippet extraction in search results" into ics-mr1
...
* commit 'b2d37b39a1bb48d9f9c5b45255c5df769b85d6ae':
docs: update sidenav to use <span> instead of <h2> for headings, under suspicion that the h2s are causing poor snippet extraction in search results
2012-01-30 16:15:29 -08:00
Scott Main
b2d37b39a1
Merge "docs: update sidenav to use <span> instead of <h2> for headings, under suspicion that the h2s are causing poor snippet extraction in search results" into ics-mr1
2012-01-30 16:13:28 -08:00
Scott Main
a21ac88b10
docs: update sidenav to use <span> instead of <h2> for headings,
...
under suspicion that the h2s are causing poor snippet extraction in search results
Change-Id: I35f414fbb104984408b087db1366535cb18d4718
2012-01-30 15:27:37 -08:00
Scott Main
a76ddf9272
am 6507df8b: docs: add meta descriptions for home and sdk also revise the G+ widget to make fit
...
* commit '6507df8b78d80403d66d321748ad47290a611e3f':
docs: add meta descriptions for home and sdk also revise the G+ widget to make fit
2012-01-30 15:14:53 -08:00
Scott Main
6507df8b78
docs: add meta descriptions for home and sdk
...
also revise the G+ widget to make fit
Change-Id: Iadc8858bec2524fa9ed905534949885c7130ccc2
2012-01-30 14:04:22 -08:00
The Android Open Source Project
827a597df7
Reconcile with ics-mr1-release
...
Change-Id: Ic6454a4b7929bbf2f453022fd8ae596e215657c2
2012-01-30 13:36:34 -08:00
The Android Automerger
10d6e70a1b
merge in ics-mr1-release history after reset to ics-mr1
2012-01-30 13:23:32 -08:00
Dianne Hackborn
25fe8ef1b5
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
e22f474856
Merge "Update documentation to reflect the old approach not working." into ics-mr1
2012-01-30 12:52:11 -08:00
Dianne Hackborn
fa9b5cae64
Update documentation to reflect the old approach not working.
...
The old approach has a problem with the original application's
recent tasks entry disappearing (this is probably a bug in the
platform). Update to an alternative approach that does work.
Change-Id: I15e582eff8c77cc22628f7b099e9f04eb5bfbce7
2012-01-30 11:45:00 -08:00
John Wang
136704a803
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
b069833e63
Merge "Adjust the LTE signal bar mapping." into ics-mr1
2012-01-30 11:20:35 -08:00
Scott Main
fb300fb2f0
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
73790a53b5
Merge "docs: add G+ page announcement to homepage" into ics-mr1
2012-01-30 10:03:21 -08:00
Scott Main
b1560f2085
docs: add G+ page announcement to homepage
...
Change-Id: I400334fc1465b67ec34af2071a6cca5b6eda116f
2012-01-30 09:59:42 -08:00
Martin Storsjo
832dc8f794
stagefright aacenc: Avoid warnings about incompatible pointer types
...
Change-Id: Ida53cd1030ebb9feb0d6916e42e8ba67a90e86c7
2012-01-30 12:59:03 +02:00
Jean-Baptiste Queru
27d2ab8b27
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
dc8668c8a7
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
9781870491
Merge "Wi-Fi: Handle disconnect in middle of DHCP operation"
2012-01-27 13:36:49 -08:00
Vishal Mahaveer
21bd79f51c
Wi-Fi: Handle disconnect in middle of DHCP operation
...
Restore power mode and BT co-ex settings when disconnect
happens in middle of DHCP operation.
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
2012-01-27 14:51:23 -06:00
John Wang
2c911b2416
Adjust the LTE signal bar mapping.
...
The new mapping are
Four bars: RSRP >= -95dBm
Three bars: -105 dBm <= RSRP < -95 dBm
Two bars: -115 dBm <= RSRP < -105 dBm
One bars: RSRP < -115 dBm
No bars: No Service
bug:5640958
Change-Id: I9efabaeac33b624ea0a58a4d3760169dff6544f6
2012-01-27 11:05:24 -08:00
The Android Automerger
6d0e26b763
merge in ics-mr1-release history after reset to ics-mr1
2012-01-26 18:32:07 -08:00
Roman Nurik
5525a43a9c
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
639b25ea28
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
bb9bffb6b9
docs: add NOTICE to action bar icon pack and sprinkle download links
...
Change-Id: I1437ce64908c28621e86fff54767ddbd2b1fcb3a
2012-01-26 15:57:34 -08:00
Roman Nurik
9d9c718925
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
00b3ceb48b
Merge "docs: Update designing-navigation training class to link to Android Design" into ics-mr1
2012-01-26 15:33:57 -08:00
Roman Nurik
3ba792c7f4
docs: Update designing-navigation training class to link to Android Design
...
Change-Id: I1cdda032f31798f9a32b7bec583dcfaa6eafb8c2
2012-01-26 13:12:22 -08:00
Daniel Sandler
70828a1d40
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
5b08738a62
Merge "Suppress mobile-out-of-service label if wifi connected." into ics-mr1
2012-01-26 13:02:32 -08:00
Daniel Sandler
62a1eb8972
Suppress mobile-out-of-service label if wifi connected.
...
Carrier name is shown if
- in service and connected to mobile data
- in service and connected to wifi
Carrier name is blanked if out of service and connected to
wifi.
"No internet connection" is shown if out of service without
any other route.
Bug: 5903914
Change-Id: I59d4d0c90e4153d73c38f7f0e150becf7e021a5b
2012-01-26 15:35:03 -05:00
Scott Main
2de74f5fa9
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
6c055bbdf4
docs: add action bar icons ZIP
...
Change-Id: Id38d82655d6bcc468890a4db93a19ac4e385db13
2012-01-26 11:35:20 -08:00
Scott Main
e7ffc5a633
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
9ac4dd8280
Merge "docs: remove the 1.0 icon template pack" into ics-mr1
2012-01-25 17:58:54 -08:00
Scott Main
3fe452906d
docs: remove the 1.0 icon template pack
...
Change-Id: Ia73426f67b95bc3c5aa39150a6518ee28a215b42
2012-01-25 17:54:28 -08:00
Scott Main
1f9026caf1
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
f466db14ec
Merge "docs: remove ADL presentation PDFs to conserve site space" into ics-mr1
2012-01-25 17:50:20 -08:00
Scott Main
948eb9b29e
docs: remove ADL presentation PDFs to conserve site space
...
Change-Id: Ie606dc02943eb27a318b183b8ebd7201e3ee38bb
2012-01-25 17:47:46 -08:00
