Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge ics-mr0 | Ed Heyl | 2011-10-25 | 5 | -20/+42 |
|\ | | | | | | | Change-Id: Ifc31b8464766d17b2f46183cbe0e7309445b07dc | ||||
| * | Import revised translations. DO NOT MERGE | Eric Fischer | 2011-10-24 | 5 | -23/+23 |
| | | | | | | | | Change-Id: Id0a01ecff491a0147ccb9cbab5ac8b45903b7481 | ||||
| * | Merge "Use UTF-8 for font size preview" into ics-mr0 | John Reck | 2011-10-24 | 2 | -3/+25 |
| |\ | |||||
| | * | Use UTF-8 for font size preview | John Reck | 2011-10-21 | 2 | -3/+25 |
| | | | | | | | | | | | | | | | | | | | | | Bug: 5489018 Apparantly ASCII isn't good enough Change-Id: I9402c7c3e1ceedc26822469b652166885a40d6e3 | ||||
* | | | Reconcile with ics-mr0-release | The Android Open Source Project | 2011-10-24 | 0 | -0/+0 |
|\ \ \ | | | | | | | | | | | | | Change-Id: I4539d65f411a9a9acf6eb998e9aa6d5b4e0a1368 | ||||
| * \ \ | merge in ics-mr0-release history after reset to ics-mr0 | The Android Automerger | 2011-10-21 | 0 | -0/+0 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | merge in ics-mr0-release history after reset to ics-mr0 | The Android Automerger | 2011-10-21 | 0 | -0/+0 |
| | |\ \ | |||||
| | | * \ | merge in ics-mr0-release history after reset to ics-mr0 | The Android Automerger | 2011-10-20 | 0 | -0/+0 |
| | | |\ \ | | | | |/ | | | |/| | |||||
* | | | | | am 1eb7d122: Merge "Fix fullscreen mode" into ics-mr0 | Michael Kolb | 2011-10-21 | 1 | -5/+19 |
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | * commit '1eb7d1224fafa2c7f327c808cf6eec6269297493': Fix fullscreen mode | ||||
| * | | | | Merge "Fix fullscreen mode" into ics-mr0 | Michael Kolb | 2011-10-21 | 1 | -5/+19 |
| |\ \ \ \ | |||||
| | * | | | | Fix fullscreen mode | Michael Kolb | 2011-10-21 | 1 | -5/+19 |
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5494143 Set fullscreen flags on window hide system UI Change-Id: I38714fd3973d2ee0baca51eb89f0ca640cbab225 | ||||
* | | | | | am ad52bc77: (-s ours) Import revised translations. DO NOT MERGE | Eric Fischer | 2011-10-21 | 0 | -0/+0 |
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | * commit 'ad52bc77f967bcdad22b3e0de1b7518766bf1d3c': Import revised translations. DO NOT MERGE | ||||
| * | | | | Import revised translations. DO NOT MERGE | Eric Fischer | 2011-10-21 | 1 | -6/+6 |
| | |/ / | |/| | | | | | | | | | | Change-Id: I7ad0ca27cf77589f5fc6ff66818b59daaa9ef3e5 | ||||
* | | | | am 42d362a2: (-s ours) Import revised translations. DO NOT MERGE | Eric Fischer | 2011-10-21 | 0 | -0/+0 |
|\ \ \ \ | |/ / / | | | | | | | | | | | | | * commit '42d362a282e99d4eb876f1906a5ee7fee4316ed3': Import revised translations. DO NOT MERGE | ||||
| * | | | Import revised translations. DO NOT MERGE | Eric Fischer | 2011-10-20 | 3 | -31/+31 |
| |/ / | | | | | | | | | | Change-Id: Ie4dd3aff98da1489ee0d9929cbf24b89eb831196 | ||||
* | | | am 59bf8725: (-s ours) Import revised translations. DO NOT MERGE | Eric Fischer | 2011-10-20 | 0 | -0/+0 |
|\ \ \ | |/ / | | | | | | | | | | * commit '59bf8725cfa019effc19b8fdcdeb117a7f710755': Import revised translations. DO NOT MERGE | ||||
| * | | Import revised translations. DO NOT MERGE | Eric Fischer | 2011-10-20 | 5 | -13/+13 |
| | | | | | | | | | | | | Change-Id: I3a1d0b21edcf98759bf205dbd5f627b55b52d75a | ||||
* | | | Reconcile with ics-mr0-release | The Android Open Source Project | 2011-10-19 | 0 | -0/+0 |
|\ \ \ | | |/ | |/| | | | | Change-Id: I1c48be157499d190ee24c7fbdc45a1839025761b | ||||
| * | | merge in ics-mr0-release history after reset to ics-mr0 | The Android Automerger | 2011-10-19 | 0 | -0/+0 |
| |\ \ | | |/ | |/| | |||||
| | * | merge in ics-mr0-release history after reset to ics-mr0 | The Android Automerger | 2011-10-18 | 0 | -0/+0 |
| | |\ | |||||
* | | \ | am ce937c5f: Merge "fix tab out animation bug" into ics-mr0 | John Reck | 2011-10-18 | 2 | -73/+113 |
|\ \ \ \ | |/ / / | | | | | | | | | | | | | * commit 'ce937c5f62b1f0b3091a123c1870377818744b52': fix tab out animation bug | ||||
| * | | | Merge "fix tab out animation bug" into ics-mr0 | John Reck | 2011-10-18 | 2 | -73/+113 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | fix tab out animation bug | Michael Kolb | 2011-10-18 | 2 | -73/+113 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5464898 Changed out animation for collapsing and scrolling Change-Id: I4a14bcb63aba9b9498a3e7835aa98d4c8312f00a | ||||
* | | | | Merge "Import revised translations." | Eric Fischer | 2011-10-18 | 47 | -1784/+607 |
|\ \ \ \ | |||||
| * | | | | Import revised translations. | Eric Fischer | 2011-10-18 | 47 | -1784/+607 |
| | | | | | | | | | | | | | | | | | | | | Change-Id: Ibf03714cd50760719911af7ff4aad92fd61e2de7 | ||||
* | | | | | am 070aaeed: (-s ours) Merge "Import revised translations. DO NOT MERGE" ↵ | Eric Fischer | 2011-10-18 | 0 | -0/+0 |
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | into ics-mr0 * commit '070aaeed9320d1cc1b4b0a9971a06f3ba049d2d4': Import revised translations. DO NOT MERGE | ||||
| * | | | | Merge "Import revised translations. DO NOT MERGE" into ics-mr0 | Eric Fischer | 2011-10-18 | 46 | -222/+600 |
| |\ \ \ \ | |||||
| | * | | | | Import revised translations. DO NOT MERGE | Eric Fischer | 2011-10-18 | 46 | -222/+600 |
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie1c099eaf9acf731c7f82969279db7bb42e9c4af | ||||
* | | | | | | am 4e61ad77: Merge "Cleanup widget config activity" into ics-mr0 | John Reck | 2011-10-18 | 2 | -5/+30 |
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | * commit '4e61ad777a698ad7c67be6e4dcf7410b30b08e6f': Cleanup widget config activity | ||||
| * | | | | | Merge "Cleanup widget config activity" into ics-mr0 | John Reck | 2011-10-18 | 2 | -5/+30 |
| |\ \ \ \ \ | |||||
| | * | | | | | Cleanup widget config activity | John Reck | 2011-10-17 | 2 | -5/+30 |
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5474306 Change-Id: I233bc89d15cc76c5bb9d0bcea8397f765b66ef24 | ||||
* | | | | | | Reconcile with ics-mr0-release | The Android Open Source Project | 2011-10-18 | 0 | -0/+0 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | Change-Id: If616230fd56a36580eefa6f709f8f5dc2d12e1f2 | ||||
| * | | | | | merge in ics-mr0-release history after reset to ics-mr0 | The Android Automerger | 2011-10-17 | 0 | -0/+0 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
* | | | | | | am 5818811e: Merge "Improve content notifications" into ics-mr0 | John Reck | 2011-10-17 | 2 | -8/+54 |
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | * commit '5818811e40d0e5805fcf68ce3117b258b2b4591d': Improve content notifications | ||||
| * | | | | | Merge "Improve content notifications" into ics-mr0 | John Reck | 2011-10-17 | 2 | -8/+54 |
| |\ \ \ \ \ | |||||
| | * | | | | | Improve content notifications | John Reck | 2011-10-17 | 2 | -8/+54 |
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5465258 Restrict when we set syncToNetwork and clean up unnecessary notifications Change-Id: I19b6d2b3df6fd70ac3a1b386137ce67d371323e4 | ||||
* | | | | | | am 288f79ea: Remove row_activated drawable | John Reck | 2011-10-17 | 5 | -24/+2 |
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | | | * commit '288f79eaaacb0c081be8a3fd7ed793be6b993646': Remove row_activated drawable | ||||
| * | | | | Remove row_activated drawable | John Reck | 2011-10-17 | 5 | -24/+2 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5463846 Replace custom row_activated with framework drawable Change-Id: Id96d3689c115cad1b4e764d551999bc94325504f | ||||
* | | | | Merge "Restore spelling to Wi-Fi. Bug: 5163232" | Claudia de Veaux | 2011-10-17 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Restore spelling to Wi-Fi. | Claudia de Veaux | 2011-10-17 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5163232 Change-Id: I80a8a56da0833b52d0c49834ab11b0fea2949735 | ||||
* | | | | | am fc853325: Merge "HTML escape most visited" into ics-mr0 | John Reck | 2011-10-17 | 1 | -10/+15 |
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | | * commit 'fc853325e9a170fb21648b939d859a46aca3bb1e': HTML escape most visited | ||||
| * | | | Merge "HTML escape most visited" into ics-mr0 | John Reck | 2011-10-17 | 1 | -10/+15 |
| |\ \ \ | |||||
| | * | | | HTML escape most visited | John Reck | 2011-10-17 | 1 | -10/+15 |
| | | |/ | | |/| | | | | | | | | | | | | | | | | | Bug: 5471514 Change-Id: Ie3f175cc8ef9fd6e66ee6ced7a0cd383e04458e2 | ||||
* | | | | am 3a301c6f: Disable Ganesh in the debug settings page. | Derek Sollenberger | 2011-10-17 | 1 | -1/+2 |
|\ \ \ \ | |/ / / | | | | | | | | | | | | | * commit '3a301c6fc2f3d6db2cdb798f65a85395a7066278': Disable Ganesh in the debug settings page. | ||||
| * | | | Disable Ganesh in the debug settings page. | Derek Sollenberger | 2011-10-17 | 1 | -1/+2 |
| |/ / | | | | | | | | | | | | | bug: 5463411 Change-Id: Icf90e4cab3ecb7b0055f01a7e58912c4a9a7b951 | ||||
* | | | Fix use of WebView.loadData() to avoid passing invalid encoding | Steve Block | 2011-10-17 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | No change in behavior, as invalid encodings have always been ignored. Bug: 5125738 Change-Id: I521bec1acc5aae17972c16a49424631b93933ea6 | ||||
* | | | Reconcile with ics-mr0-release | The Android Open Source Project | 2011-10-14 | 0 | -0/+0 |
|\ \ \ | | |/ | |/| | | | | Change-Id: Iff6fe79bb32f07a776e0f12569baa738e76bbd37 | ||||
| * | | merge in ics-mr0-release history after reset to ics-mr0 | The Android Automerger | 2011-10-13 | 0 | -0/+0 |
| |\ \ | | |/ | |/| | |||||
* | | | am 4ec6e1e5: Merge "Expand scope of try/catch" into ics-mr0 | John Reck | 2011-10-13 | 1 | -5/+3 |
|\ \ \ | |/ / | | | | | | | | | | * commit '4ec6e1e521951a3b3d521a20122ba7100dbd6cc8': Expand scope of try/catch | ||||
| * | | Merge "Expand scope of try/catch" into ics-mr0 | John Reck | 2011-10-13 | 1 | -5/+3 |
| |\ \ |