summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | Merge "Add application launch category." into ics-mr1Jeff Brown2011-11-291-0/+1
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Add application launch category.Jeff Brown2011-11-281-0/+1
| | |/ / /
* | | | | Merge "Import revised translations."Eric Fischer2011-11-2947-148/+148
|\ \ \ \ \
| * | | | | Import revised translations.Eric Fischer2011-11-2947-148/+148
* | | | | | am 7431a694: Merge "Fix NPE at startup" into ics-mr1Bart Sears2011-11-281-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | Merge "Fix NPE at startup" into ics-mr1Bart Sears2011-11-281-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix NPE at startupMichael Kolb2011-11-281-1/+1
* | | | | Merge "Remove an init. workaround for Cookiemanager."Selim Gurun2011-11-231-2/+0
|\ \ \ \ \
| * | | | | Remove an init. workaround for Cookiemanager.Selim Gurun2011-11-211-2/+0
* | | | | | Merge "Crash recover no longer uses icicle."George Mount2011-11-235-98/+162
|\ \ \ \ \ \
| * | | | | | Crash recover no longer uses icicle.George Mount2011-11-235-98/+162
| |/ / / / /
* | | | | | Edited string to use standard confirmation text.Claudia de Veaux2011-11-231-1/+1
* | | | | | am 6cfe9772: Start downloads as a new taskJohn Reck2011-11-231-0/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Start downloads as a new taskJohn Reck2011-11-231-0/+1
| | |/ / / | |/| | |
* | | | | am 63faec47: Merge "Add more options to Quick Controls on phone" into ics-mr1Michael Kolb2011-11-232-2/+14
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Add more options to Quick Controls on phone" into ics-mr1Michael Kolb2011-11-232-2/+14
| |\ \ \ \
| | * | | | Add more options to Quick Controls on phoneMichael Kolb2011-11-222-2/+14
* | | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-11-220-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-220-0/+0
| |\ \ \ \ \
* | \ \ \ \ \ am 78ea2875: Merge "Support super-full-screen mode for html5 video" into ics-mr1Teng-Hui Zhu2011-11-221-1/+6
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge "Support super-full-screen mode for html5 video" into ics-mr1Teng-Hui Zhu2011-11-221-1/+6
| |\ \ \ \ \ \
| | * | | | | | Support super-full-screen mode for html5 videoTeng-Hui Zhu2011-11-211-1/+6
* | | | | | | | am 1107eca1: (-s ours) Merge "Import revised translations. DO NOT MERGE" into...Eric Fischer2011-11-210-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Import revised translations. DO NOT MERGE" into ics-mr1Eric Fischer2011-11-2111-46/+46
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | Import revised translations. DO NOT MERGEEric Fischer2011-11-2111-46/+46
| | | |/ / / / | | |/| | | |
* | | | | | | am a48621be: Merge "Monkey season" into ics-mr1Michael Kolb2011-11-211-1/+4
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Monkey season" into ics-mr1Michael Kolb2011-11-211-1/+4
| |\ \ \ \ \ \
| | * | | | | | Monkey seasonMichael Kolb2011-11-211-1/+4
* | | | | | | | am b1fb70ce: Fix stop/refresh menu stateMichael Kolb2011-11-212-20/+20
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Fix stop/refresh menu stateMichael Kolb2011-11-212-20/+20
| |/ / / / / /
* | | | | | | am 2edc80c2: URL bar select allJohn Reck2011-11-211-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | / / | |_|_|_|/ / |/| | | | |
| * | | | | URL bar select allJohn Reck2011-11-211-0/+1
| |/ / / /
* | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-11-180-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-170-0/+0
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-160-0/+0
| | |\ \ \
| | | * \ \ merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-150-0/+0
| | | |\ \ \
| | | | * \ \ merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-130-0/+0
| | | | |\ \ \
* | | | | \ \ \ am 3e5e5fad: Merge "Remove the psychic labs feature." into ics-mr1Narayan Kamath2011-11-1819-2524/+36
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Merge "Remove the psychic labs feature." into ics-mr1Narayan Kamath2011-11-1819-2524/+36
| |\ \ \ \ \ \ \
| | * | | | | | | Remove the psychic labs feature.Narayan Kamath2011-11-1819-2524/+36
| | | |_|_|/ / / | | |/| | | | |
* | | | | | | | am a9a5967e: Add content description to screenshots in tab managerMichael Kolb2011-11-181-13/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Add content description to screenshots in tab managerMichael Kolb2011-11-171-13/+3
| | |/ / / / / | |/| | | | |
* | | | | | | Show download complete message for data URI downloads.George Mount2011-11-171-1/+1
* | | | | | | am 4eb312fa: Merge "Fix NPE in NavigationBarBase.onAction" into ics-mr1John Reck2011-11-171-1/+5
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Fix NPE in NavigationBarBase.onAction" into ics-mr1John Reck2011-11-161-1/+5
| |\ \ \ \ \ \
| | * | | | | | Fix NPE in NavigationBarBase.onActionJohn Reck2011-11-151-1/+5
* | | | | | | | am b217888b: Merge "Prevent NPE in NavTabScroller" into ics-mr1Michael Kolb2011-11-171-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Prevent NPE in NavTabScroller" into ics-mr1Michael Kolb2011-11-161-0/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Prevent NPE in NavTabScrollerMichael Kolb2011-11-161-0/+1
| | | |_|/ / / / | | |/| | | | |
* | | | | | | | am 945aace8: (-s ours) Merge "Import revised translations. DO NOT MERGE" int...Eric Fischer2011-11-170-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /