summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove old != new onScrollChanged checkJohn Reck2011-11-141-12/+10
* Merge "Set home button enabled" into ics-mr1John Reck2011-11-101-0/+1
|\
| * Set home button enabledJohn Reck2011-11-101-0/+1
* | Merge "Fix assets and layout for popup window" into ics-mr1Michael Kolb2011-11-101-16/+11
|\ \
| * | Fix assets and layout for popup windowMichael Kolb2011-11-101-16/+11
* | | Merge "Handle error condition when inserting snapshots" into ics-mr1John Reck2011-11-101-0/+8
|\ \ \
| * | | Handle error condition when inserting snapshotsJohn Reck2011-11-101-0/+8
| | |/ | |/|
* | | Merge "Special case the root folder in add bookmarks" into ics-mr1John Reck2011-11-101-1/+8
|\ \ \ | |/ / |/| |
| * | Special case the root folder in add bookmarksJohn Reck2011-11-091-1/+8
| |/
* | am 6c0dd881: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-11-090-0/+0
|\ \ | |/ |/|
| * Import revised translations. DO NOT MERGEEric Fischer2011-11-082-7/+7
* | Merge "Add Monkey protection" into ics-mr1Michael Kolb2011-11-081-1/+3
|\ \
| * | Add Monkey protectionMichael Kolb2011-11-071-1/+3
* | | Merge "Add support to minimize the WebView's memory consumption by default" i...Teng-Hui Zhu2011-11-072-0/+8
|\ \ \
| * | | Add support to minimize the WebView's memory consumption by defaultTeng-Hui Zhu2011-11-072-0/+8
* | | | Import revised translations. DO NOT MERGEEric Fischer2011-11-0728-57/+30
| |/ / |/| |
* | | Reconcile with ics-mr0-releaseThe Android Open Source Project2011-11-040-0/+0
|\ \ \
| * \ \ merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-11-030-0/+0
| |\ \ \ | | |_|/ | |/| |
* | | | am b8ce8635: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-11-030-0/+0
|\ \ \ \ | |/ / /
| * | | Import revised translations. DO NOT MERGEEric Fischer2011-11-022-3/+3
* | | | Merge "Import revised translations. DO NOT MERGE" into ics-mr1Eric Fischer2011-11-0123-43/+802
|\ \ \ \ | |_|_|/ |/| | |
| * | | Import revised translations. DO NOT MERGEEric Fischer2011-11-0123-43/+802
* | | | Merge "Switch Tab to DataController" into ics-mr1John Reck2011-11-012-81/+95
|\ \ \ \
| * | | | Switch Tab to DataControllerJohn Reck2011-10-312-81/+95
* | | | | Merge "Monkey proofing" into ics-mr1John Reck2011-10-311-13/+25
|\ \ \ \ \
| * | | | | Monkey proofingJohn Reck2011-10-311-13/+25
| |/ / / /
* | | | | Merge "Fix corner case with url pulldown" into ics-mr1John Reck2011-10-311-1/+5
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix corner case with url pulldownJohn Reck2011-10-311-1/+5
| |/ / /
* | | | Reconcile with ics-mr0-releaseThe Android Open Source Project2011-10-310-0/+0
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-300-0/+0
| |\ \ | | |/ | |/|
* | | am 93e37c66: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-10-290-0/+0
|\ \ \ | |/ /
| * | Import revised translations. DO NOT MERGEEric Fischer2011-10-281-1/+1
* | | Merge "Import revised translations. DO NOT MERGE" into ics-mr1Eric Fischer2011-10-2847-0/+94
|\ \ \
| * | | Import revised translations. DO NOT MERGEEric Fischer2011-10-2847-0/+94
* | | | Reconcile with ics-mr0-releaseThe Android Open Source Project2011-10-280-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-280-0/+0
| |\ \ \ | | |_|/ | |/| |
| | * | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-260-0/+0
| | |\ \
| | | * \ merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-240-0/+0
| | | |\ \
| | | | * \ merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-240-0/+0
| | | | |\ \
* | | | | \ \ Merge "Don't set the upload type unless in debug" into ics-mr1John Reck2011-10-281-6/+10
|\ \ \ \ \ \ \
| * | | | | | | Don't set the upload type unless in debugJohn Reck2011-10-271-6/+10
* | | | | | | | Merge "Updated help thumbnail asset" into ics-mr1John Reck2011-10-271-0/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Updated help thumbnail assetJohn Reck2011-10-271-0/+0
| |/ / / / / / /
* | | | | | | | Fix urlbar background on tabletMichael Kolb2011-10-271-0/+0
* | | | | | | | am 22e77ee7: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-10-270-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | / | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Import revised translations. DO NOT MERGEEric Fischer2011-10-274-12/+12
| | |/ / / / | |/| | | |
* | | | | | Merge "Import revised translations. DO NOT MERGE" into ics-mr1Eric Fischer2011-10-274-12/+12
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Import revised translations. DO NOT MERGEEric Fischer2011-10-264-12/+12
* | | | | | Merge "Add new default bookmark" into ics-mr1John Reck2011-10-273-0/+7
|\ \ \ \ \ \
| * | | | | | Add new default bookmarkJohn Reck2011-10-263-0/+7