Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | | * | | | | | | | | | Import revised translations. DO NOT MERGE | Eric Fischer | 2011-11-02 | 9 | -45/+45 | |
* | | | | | | | | | | | | am f2158d08: am e08be659: Merge "Doc change: Update instructions to match ICS... | Katie McCormick | 2011-11-03 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | am e08be659: Merge "Doc change: Update instructions to match ICS UI" into ics... | Katie McCormick | 2011-11-03 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | ||||||
| | * | | | | | | | | | | Merge "Doc change: Update instructions to match ICS UI" into ics-mr0 | Katie McCormick | 2011-11-02 | 1 | -4/+7 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | Doc change: Update instructions to match ICS UI | Katie McCormick | 2011-11-02 | 1 | -4/+7 | |
* | | | | | | | | | | | | | am 31a05f33: Doc change: Update instructions to match ICS UI | Katie McCormick | 2011-11-03 | 1 | -4/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | Doc change: Update instructions to match ICS UI | Katie McCormick | 2011-11-02 | 1 | -4/+7 | |
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | am b41d9f8a: Merge "Fix bug 5557267 - [ViewPager] non-primary fragments unnec... | Adam Powell | 2011-11-02 | 1 | -2/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | Merge "Fix bug 5557267 - [ViewPager] non-primary fragments unnecessary stoppe... | Adam Powell | 2011-11-02 | 1 | -2/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | ||||||
| | * | | | | | | | | | | Fix bug 5557267 - [ViewPager] non-primary fragments unnecessary | Adam Powell | 2011-11-02 | 1 | -2/+3 | |
| | | |_|_|_|/ / / / / | | |/| | | | | | | | | ||||||
* | | | | | | | | | | | am b419abca: am 7f00c22b: Merge "Avoid duplicate dialogs leading to NPE" into... | Irfan Sheriff | 2011-11-02 | 1 | -14/+101 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | am 7f00c22b: Merge "Avoid duplicate dialogs leading to NPE" into ics-mr0 | Irfan Sheriff | 2011-11-02 | 1 | -14/+101 | |
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | ||||||
| | * | | | | | | | | | Merge "Avoid duplicate dialogs leading to NPE" into ics-mr0 | Irfan Sheriff | 2011-11-02 | 1 | -14/+101 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | Avoid duplicate dialogs leading to NPE | Irfan Sheriff | 2011-11-01 | 1 | -14/+101 | |
* | | | | | | | | | | | | am 4a113251: am 451fa13e: Merge "Ignore errors when untethering" into ics-mr0 | Robert Greenwalt | 2011-11-02 | 1 | -52/+27 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | am 451fa13e: Merge "Ignore errors when untethering" into ics-mr0 | Robert Greenwalt | 2011-11-02 | 1 | -52/+27 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | ||||||
| | * | | | | | | | | | | Merge "Ignore errors when untethering" into ics-mr0 | Robert Greenwalt | 2011-11-02 | 1 | -52/+27 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | Ignore errors when untethering | Robert Greenwalt | 2011-11-02 | 1 | -52/+27 | |
* | | | | | | | | | | | | | Merge "Import revised translations." | Eric Fischer | 2011-11-02 | 67 | -9253/+11848 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Import revised translations. | Eric Fischer | 2011-11-02 | 67 | -9253/+11848 | |
* | | | | | | | | | | | | | | Merge "Set theme-tag in render log when failing to find style" | Tor Norbye | 2011-11-02 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Set theme-tag in render log when failing to find style | Tor Norbye | 2011-11-01 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | am 42774dec: am aea8d850: docs: a couple typos bugs 5552478 5553096 | Scott Main | 2011-11-02 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | am aea8d850: docs: a couple typos bugs 5552478 5553096 | Scott Main | 2011-11-02 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | docs: a couple typos | Scott Main | 2011-11-02 | 1 | -2/+2 | |
| | | |_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | am 1997fe14: Merge "Update KeyBoardView to reflect the interaction model in L... | Svetoslav Ganov | 2011-11-02 | 1 | -25/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | Merge "Update KeyBoardView to reflect the interaction model in Latin IME" int... | Svetoslav Ganov | 2011-11-02 | 1 | -25/+10 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | Update KeyBoardView to reflect the interaction model in Latin IME | Svetoslav Ganov | 2011-11-01 | 1 | -25/+10 | |
* | | | | | | | | | | | | | | | am 779c1b85: Merge "Make the notification panel header opaque." into ics-mr1 | Peter Ng | 2011-11-02 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | Merge "Make the notification panel header opaque." into ics-mr1 | Peter Ng | 2011-11-02 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | Make the notification panel header opaque. | Daniel Sandler | 2011-11-02 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | am c7dbfc64: Merge "making slide unlock on tablet have a larger radius" into ... | Peter Ng | 2011-11-02 | 4 | -4/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | Merge "making slide unlock on tablet have a larger radius" into ics-mr1 | Peter Ng | 2011-11-02 | 4 | -4/+11 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | making slide unlock on tablet have a larger radius | Peter Ng | 2011-11-01 | 4 | -4/+11 | |
| | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | am dab15d14: Merge "Don\'t expand the SearchView if already expanded." into i... | Amith Yamasani | 2011-11-02 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | Merge "Don't expand the SearchView if already expanded." into ics-mr1 | Amith Yamasani | 2011-11-02 | 1 | -0/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | Don't expand the SearchView if already expanded. | Amith Yamasani | 2011-11-01 | 1 | -0/+2 | |
* | | | | | | | | | | | | | | | | am 11b49ba9: Reconcile with ics-mr0-release ics-factoryrom-2-release | The Android Open Source Project | 2011-11-02 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | ||||||
| | | | | | | | | | | | | | | | | ||||||
| | \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| *-. \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Reconcile with ics-mr0-release ics-factoryrom-2-release | The Android Open Source Project | 2011-11-02 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | Revert "Merge "BatteryService(jni): properly handle read's return value" into... | The Android Automerger | 2011-11-02 | 1 | -3/+3 | |
| | | * | | | | | | | | | | | | | | Revert "Merge "Update camera continuous autofocus javadoc." into ics-mr0" | The Android Automerger | 2011-11-02 | 2 | -23/+18 | |
| | | * | | | | | | | | | | | | | | Revert "Merge "Fix potential segfault in RS watchdog." into ics-mr0" | The Android Automerger | 2011-11-02 | 1 | -1/+0 | |
| | | * | | | | | | | | | | | | | | Revert "Merge "Improve the slow query instrumentation." into ics-mr0" | The Android Automerger | 2011-11-02 | 7 | -76/+30 | |
| | | * | | | | | | | | | | | | | | merge in ics-factoryrom-2-release history after reset to ics-mr0 | The Android Automerger | 2011-11-02 | 0 | -0/+0 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / / / / | | | |/| | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | Revert "Merge "BatteryService(jni): properly handle read's return value" into... | The Android Automerger | 2011-11-02 | 1 | -3/+3 | |
| | | |/ / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | merge in ics-mr0-release history after reset to ics-mr0 | The Android Automerger | 2011-11-02 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | am 7a5a50c1: Merge "Bug 5513073 - IllegalArgumentException: View not attached... | Adam Powell | 2011-11-02 | 1 | -1/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | Merge "Bug 5513073 - IllegalArgumentException: View not attached to window ma... | Adam Powell | 2011-11-02 | 1 | -1/+9 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | Bug 5513073 - IllegalArgumentException: View not attached to window | Adam Powell | 2011-11-01 | 1 | -1/+9 | |
* | | | | | | | | | | | | | | | | | am e5d0f199: Merge "CalendarView title incorrectly updated for different lang... | Svetoslav Ganov | 2011-11-02 | 1 | -13/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |