summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Transfer data from BP1 to BP2John Reck2011-05-186-8/+88
* resolved conflicts for merge of e619f1e5 to masterJohn Reck2011-05-1811-9/+39
|\
| * am 275932ff: Merge "Use tablet UI for large" into honeycomb-mr2John Reck2011-05-1712-8/+38
| |\
| | * Merge "Use tablet UI for large" into honeycomb-mr2John Reck2011-05-1712-8/+38
| | |\
| | | * Use tablet UI for largeJohn Reck2011-05-1712-8/+38
* | | | am 43edbab2: (-s ours) am a94de4fc: DO NOT MERGE - Update and fix RLZ code: ...Ed Tam2011-05-180-0/+0
|\ \ \ \ | |/ / /
| * | | am a94de4fc: DO NOT MERGE - Update and fix RLZ code: - Cache RLZ parameter ...Ed Tam2011-05-177-129/+218
| |\ \ \ | | |/ /
| | * | DO NOT MERGE - Update and fix RLZ code:Ed Tam2011-05-167-129/+218
| | |/
* | | Import revised translations.Eric Fischer2011-05-1741-4/+162
* | | Add provider support for moving between accountsJohn Reck2011-05-172-24/+91
* | | am e4e3d9c4: (-s ours) am 27f72f5f: DO NOT MERGE: from master -- Don\'t resta...Dianne Hackborn2011-05-160-0/+0
|\ \ \ | |/ /
| * | am 27f72f5f: DO NOT MERGE: from master -- Don\'t restart when screen size cha...Dianne Hackborn2011-05-161-2/+2
| |\ \ | | |/
| | * DO NOT MERGE: from master -- Don't restart when screen size changes.Dianne Hackborn2011-05-131-2/+2
* | | More preventing recursive foldersJohn Reck2011-05-131-1/+6
* | | Merge "Prevent adding a folder to itself recursively"John Reck2011-05-131-1/+1
|\ \ \
| * | | Prevent adding a folder to itself recursivelyJohn Reck2011-05-131-1/+1
* | | | Merge "Fix bug where wrong folder contents are loaded"John Reck2011-05-131-4/+13
|\ \ \ \
| * | | | Fix bug where wrong folder contents are loadedJohn Reck2011-05-131-4/+13
| |/ / /
* | | | Remove account adding from getBookmarksUriJohn Reck2011-05-132-5/+2
|/ / /
* | | Merge "Make add/edit bookmark be account-aware"John Reck2011-05-137-336/+367
|\ \ \
| * | | Make add/edit bookmark be account-awareJohn Reck2011-05-137-336/+367
* | | | Merge "introduce tab IDs"Michael Kolb2011-05-1211-198/+186
|\ \ \ \
| * | | | introduce tab IDsMichael Kolb2011-05-1211-198/+186
* | | | | Strip text2_urlJohn Reck2011-05-112-4/+3
* | | | | Merge "Create accounts view"John Reck2011-05-111-5/+27
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Create accounts viewJohn Reck2011-05-111-5/+27
* | | | | am 9b561605: (-s ours) am ed8c96a0: am b70882c8: (-s ours) Import revised tra...Eric Fischer2011-05-110-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | am ed8c96a0: am b70882c8: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-05-100-0/+0
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | am b70882c8: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-05-100-0/+0
| | |\ \ \
| | | * | | Import revised translations. DO NOT MERGEEric Fischer2011-04-294-8/+8
* | | | | | am 40219c5d: (-s ours) am 237d9b29: Import revised translations. DO NOT MERGEEric Fischer2011-05-110-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | |
| * | | | am 237d9b29: Import revised translations. DO NOT MERGEEric Fischer2011-05-105-10/+10
| |\ \ \ \ | | |/ / /
| | * | | Import revised translations. DO NOT MERGEEric Fischer2011-05-095-10/+10
* | | | | Merge "Import revised translations."Eric Fischer2011-05-1040-334/+182
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Import revised translations.Eric Fischer2011-05-1040-334/+182
* | | | | Merge "Initial pass at collapsable bookmarks"John Reck2011-05-1017-256/+795
|\ \ \ \ \
| * | | | | Initial pass at collapsable bookmarksJohn Reck2011-05-1017-256/+795
* | | | | | fix new tab regressionMichael Kolb2011-05-094-6/+14
* | | | | | Merge "refactor open tab code"Michael Kolb2011-05-099-146/+91
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | refactor open tab codeMichael Kolb2011-05-099-146/+91
* | | | | | am 482e8730: (-s ours) am 1214af3f: DO NOT MERGE - fix scroll bugMichael Kolb2011-05-090-0/+0
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | |
| * | | | am 1214af3f: DO NOT MERGE - fix scroll bugMichael Kolb2011-05-094-46/+22
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | DO NOT MERGE - fix scroll bugMichael Kolb2011-05-054-46/+22
| | | |/ | | |/|
* | | | Merge "fix navscreen orientation"Michael Kolb2011-05-098-32/+130
|\ \ \ \
| * | | | fix navscreen orientationMichael Kolb2011-05-098-32/+130
* | | | | Merge "Fix AutoFill"John Reck2011-05-061-2/+6
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix AutoFillJohn Reck2011-05-061-2/+6
| | |_|/ | |/| |
* | | | Merge "change navscreen in landscape"Michael Kolb2011-05-042-0/+106
|\ \ \ \
| * | | | change navscreen in landscapeMichael Kolb2011-05-042-0/+106
* | | | | am 56c647bc: am 18cbc618: am 907c0563: Merge "Error in search engine script"Conley Owens2011-05-041-1/+1
|\ \ \ \ \ | | |_|/ / | |/| | |