summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | * | | | | | | | | Import revised translations. DO NOT MERGEEric Fischer2011-11-029-45/+45
* | | | | | | | | | | | am f2158d08: am e08be659: Merge "Doc change: Update instructions to match ICS...Katie McCormick2011-11-030-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am e08be659: Merge "Doc change: Update instructions to match ICS UI" into ics...Katie McCormick2011-11-030-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Merge "Doc change: Update instructions to match ICS UI" into ics-mr0Katie McCormick2011-11-021-4/+7
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Doc change: Update instructions to match ICS UIKatie McCormick2011-11-021-4/+7
* | | | | | | | | | | | | am 31a05f33: Doc change: Update instructions to match ICS UIKatie McCormick2011-11-031-4/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Doc change: Update instructions to match ICS UIKatie McCormick2011-11-021-4/+7
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | am b41d9f8a: Merge "Fix bug 5557267 - [ViewPager] non-primary fragments unnec...Adam Powell2011-11-021-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge "Fix bug 5557267 - [ViewPager] non-primary fragments unnecessary stoppe...Adam Powell2011-11-021-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| | * | | | | | | | | | Fix bug 5557267 - [ViewPager] non-primary fragments unnecessaryAdam Powell2011-11-021-2/+3
| | | |_|_|_|/ / / / / | | |/| | | | | | | |
* | | | | | | | | | | am b419abca: am 7f00c22b: Merge "Avoid duplicate dialogs leading to NPE" into...Irfan Sheriff2011-11-021-14/+101
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am 7f00c22b: Merge "Avoid duplicate dialogs leading to NPE" into ics-mr0Irfan Sheriff2011-11-021-14/+101
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge "Avoid duplicate dialogs leading to NPE" into ics-mr0Irfan Sheriff2011-11-021-14/+101
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Avoid duplicate dialogs leading to NPEIrfan Sheriff2011-11-011-14/+101
* | | | | | | | | | | | am 4a113251: am 451fa13e: Merge "Ignore errors when untethering" into ics-mr0Robert Greenwalt2011-11-021-52/+27
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am 451fa13e: Merge "Ignore errors when untethering" into ics-mr0Robert Greenwalt2011-11-021-52/+27
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Merge "Ignore errors when untethering" into ics-mr0Robert Greenwalt2011-11-021-52/+27
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Ignore errors when untetheringRobert Greenwalt2011-11-021-52/+27
* | | | | | | | | | | | | Merge "Import revised translations."Eric Fischer2011-11-0267-9253/+11848
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Import revised translations.Eric Fischer2011-11-0267-9253/+11848
* | | | | | | | | | | | | | Merge "Set theme-tag in render log when failing to find style"Tor Norbye2011-11-021-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Set theme-tag in render log when failing to find styleTor Norbye2011-11-011-1/+1
* | | | | | | | | | | | | | | am 42774dec: am aea8d850: docs: a couple typos bugs 5552478 5553096Scott Main2011-11-021-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | am aea8d850: docs: a couple typos bugs 5552478 5553096Scott Main2011-11-021-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | docs: a couple typosScott Main2011-11-021-2/+2
| | | |_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | |
* | | | | | | | | | | | | | am 1997fe14: Merge "Update KeyBoardView to reflect the interaction model in L...Svetoslav Ganov2011-11-021-25/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge "Update KeyBoardView to reflect the interaction model in Latin IME" int...Svetoslav Ganov2011-11-021-25/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Update KeyBoardView to reflect the interaction model in Latin IMESvetoslav Ganov2011-11-011-25/+10
* | | | | | | | | | | | | | | am 779c1b85: Merge "Make the notification panel header opaque." into ics-mr1Peter Ng2011-11-021-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge "Make the notification panel header opaque." into ics-mr1Peter Ng2011-11-021-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Make the notification panel header opaque.Daniel Sandler2011-11-021-1/+1
* | | | | | | | | | | | | | | | am c7dbfc64: Merge "making slide unlock on tablet have a larger radius" into ...Peter Ng2011-11-024-4/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge "making slide unlock on tablet have a larger radius" into ics-mr1Peter Ng2011-11-024-4/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | making slide unlock on tablet have a larger radiusPeter Ng2011-11-014-4/+11
| | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | | am dab15d14: Merge "Don\'t expand the SearchView if already expanded." into i...Amith Yamasani2011-11-021-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge "Don't expand the SearchView if already expanded." into ics-mr1Amith Yamasani2011-11-021-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Don't expand the SearchView if already expanded.Amith Yamasani2011-11-011-0/+2
* | | | | | | | | | | | | | | | am 11b49ba9: Reconcile with ics-mr0-release ics-factoryrom-2-releaseThe Android Open Source Project2011-11-020-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| | | | | | | | | | | | | | | |
| | \ \ \ \ \ \ \ \ \ \ \ \ \ \
| *-. \ \ \ \ \ \ \ \ \ \ \ \ \ \ Reconcile with ics-mr0-release ics-factoryrom-2-releaseThe Android Open Source Project2011-11-020-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Revert "Merge "BatteryService(jni): properly handle read's return value" into...The Android Automerger2011-11-021-3/+3
| | | * | | | | | | | | | | | | | Revert "Merge "Update camera continuous autofocus javadoc." into ics-mr0"The Android Automerger2011-11-022-23/+18
| | | * | | | | | | | | | | | | | Revert "Merge "Fix potential segfault in RS watchdog." into ics-mr0"The Android Automerger2011-11-021-1/+0
| | | * | | | | | | | | | | | | | Revert "Merge "Improve the slow query instrumentation." into ics-mr0"The Android Automerger2011-11-027-76/+30
| | | * | | | | | | | | | | | | | merge in ics-factoryrom-2-release history after reset to ics-mr0The Android Automerger2011-11-020-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / / / / | | | |/| | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | Revert "Merge "BatteryService(jni): properly handle read's return value" into...The Android Automerger2011-11-021-3/+3
| | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-11-020-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | | am 7a5a50c1: Merge "Bug 5513073 - IllegalArgumentException: View not attached...Adam Powell2011-11-021-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge "Bug 5513073 - IllegalArgumentException: View not attached to window ma...Adam Powell2011-11-021-1/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Bug 5513073 - IllegalArgumentException: View not attached to windowAdam Powell2011-11-011-1/+9
* | | | | | | | | | | | | | | | | am e5d0f199: Merge "CalendarView title incorrectly updated for different lang...Svetoslav Ganov2011-11-021-13/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /