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

41907 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
13393bdca5 am 5e095939: docs: update menu guide with CAB and popup menu, plus many other revisions 
* commit '5e0959393426371dadef2c7905d5c915a1ac2dd4':
  docs: update menu guide with CAB and popup menu, plus many other revisions
 2012-02-01 11:45:49 -08:00
Scott Main
d6d4b9aa2f Merge "docs: dashboard update for feb 1" into ics-mr1 2012-02-01 11:43:48 -08:00
Xia Wang
365b1d50c0 am ccc11c4d: Merge "Fix a typo in image processing test" into ics-mr1 
* commit 'ccc11c4d3c8357a402b84c546e7b2f889729358c':
  Fix a typo in image processing test
 2012-02-01 10:54:30 -08:00
Xia Wang
6bd64dd226 Merge "Fix a typo in image processing test" into ics-mr1 2012-02-01 10:51:43 -08:00
The Android Open Source Project
322e2109e3 Reconcile with ics-mr1-release 
Change-Id: Ia38fac8a91adbce6ae5c796c86252ac2364e3a6f
 2012-02-01 08:42:59 -08:00
Scott Main
44959ef30f am 0b2701b7: Merge "docs: change that stated as a few doc fixes and turned into fully documenting the device default themes and fixing many more, including adding API level information for older themes to avoid confusion. Oh and fix an unclosed <em> tag causing a form 
* commit '0b2701b7344fb7b7b6f9a1c1c99c8ede81b49d2d':
  docs: change that stated as a few doc fixes and turned into fully documenting the device default themes and fixing many more, including adding API level information for older themes to avoid confusion. Oh and fix an unclosed <em> tag causing a format bug.
 2012-01-31 16:10:38 -08:00
Scott Main
e9a01c3838 Merge "docs: change that stated as a few doc fixes and turned into fully documenting the device default themes and fixing many more, including adding API level information for older themes to avoid confusion. Oh and fix an unclosed <em> tag causing a format bug." into ics-mr1 2012-01-31 16:08:09 -08:00
The Android Automerger
91741bc2e6 merge in ics-mr1-release history after reset to ics-mr1 2012-01-31 15:42:17 -08:00
Justin Ho
c9a53618ef am 792d83c5: Merge "Use LTE SNR and RSRP to set signal level bar." into ics-mr1 
* commit '792d83c5087a7a6dec4e64f59f5b78d1041c9585':
  Use LTE SNR and RSRP to set signal level bar.
 2012-01-31 14:02:44 -08:00
Justin Ho
675fe24179 Merge "Use LTE SNR and RSRP to set signal level bar." into ics-mr1 2012-01-31 14:00:55 -08:00
Scott Main
7b8d173a28 am 34260ad7: Merge "docs: fix locale name; South Africa is local en_ZA external issue 23133" into ics-mr1 
* commit '34260ad79ede2ed35cc9859095b778f194b9650b':
  docs: fix locale name; South Africa is local en_ZA external issue 23133
 2012-01-31 08:41:03 -08:00
Scott Main
78dbcd5f1a 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
38a89182b5 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
addfd725e7 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
33e837a5de Merge "docs: fix typo in market doc external issue 22650" into ics-mr1 2012-01-31 08:39:03 -08:00
Scott Main
32d086fc1e 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
0bd3b2ff51 Merge "docs: fix typos and clarify some grammar in summary external issue 21548" into ics-mr1 2012-01-31 08:37:59 -08:00
The Android Automerger
50712688a6 merge in ics-mr1-release history after reset to ics-mr1 2012-01-30 23:33:37 -08:00
Scott Main
135c935a47 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
0aa8f39a3d 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
79bc3654c3 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
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