summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Import revised translations.Eric Fischer2011-06-2986-792/+551
* Merge "Fix IntentHandler behavior"John Reck2011-06-296-56/+221
|\
| * Fix IntentHandler behaviorJohn Reck2011-06-296-56/+221
* | Merge "Fix wrong thread issue"John Reck2011-06-291-3/+6
|\ \
| * | Fix wrong thread issueJohn Reck2011-06-291-3/+6
| |/
* | Fix (workaround?) for NPE when showing a preloaded tab.Mathew Inwood2011-06-291-2/+2
* | 2nd try: Shows the right URL that has a cert error.Huahui Wu2011-06-282-10/+18
* | Merge "Revert "Shows the right URL that has a cert error.""Huahui Wu2011-06-282-18/+10
|\ \
| * | Revert "Shows the right URL that has a cert error."Huahui Wu2011-06-282-18/+10
* | | Merge "Shows the right URL that has a cert error."Huahui Wu2011-06-282-10/+18
|\ \ \ | |/ / | | / | |/ |/|
| * Shows the right URL that has a cert error.Huahui Wu2011-06-272-10/+18
* | Merge "Prevent duplicates in omnibox"John Reck2011-06-272-2/+8
|\ \
| * | Prevent duplicates in omniboxJohn Reck2011-06-272-2/+8
* | | Merge "Fix tests"John Reck2011-06-271-0/+1
|\ \ \
| * | | Fix testsJohn Reck2011-06-271-0/+1
| |/ /
* | | Merge "Move most visited to set homepage"John Reck2011-06-279-177/+171
|\ \ \
| * | | Move most visited to set homepageJohn Reck2011-06-279-177/+171
| |/ /
* | | Reconcile with gingerbread-releaseThe Android Open Source Project2011-06-270-0/+0
|\ \ \
| * | | DO NOT MERGE Prevent loading javascript: uris in existing tabsJohn Reck2011-06-241-2/+9
* | | | Merge "Moving ssl_certificate layout, resources, and helper code to SslCertif...Brian Carlstrom2011-06-2746-996/+10
|\ \ \ \ | |_|/ / |/| | |
| * | | Moving ssl_certificate layout, resources, and helper code to SslCertificateBrian Carlstrom2011-06-2746-996/+10
* | | | Merge "Attempt to automatically restore after crash"John Reck2011-06-271-4/+43
|\ \ \ \
| * | | | Attempt to automatically restore after crashJohn Reck2011-06-241-4/+43
* | | | | Merge "Tweak title bar animation"John Reck2011-06-272-4/+19
|\ \ \ \ \
| * | | | | Tweak title bar animationJohn Reck2011-06-242-4/+19
| |/ / / /
* | | | | Merge "Fix title bar bug"John Reck2011-06-271-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix title bar bugJohn Reck2011-06-241-1/+1
| |/ / /
* | | | Replace KeyChainActivity placeholder UI with more polished dialog (2 of 5)Brian Carlstrom2011-06-261-1/+17
|/ / /
* | | Reconcile with gingerbread-releaseThe Android Open Source Project2011-06-240-0/+0
|\ \ \ | |/ /
| * | DO NOT MERGE Security fixJohn Reck2011-06-211-26/+23
* | | Titlebar Autoshow tweaksJohn Reck2011-06-235-44/+11
| |/ |/|
* | Merge "Switch omnibox to dark theme"John Reck2011-06-2316-4/+42
|\ \
| * | Switch omnibox to dark themeJohn Reck2011-06-2216-4/+42
* | | am 463d599b: (-s ours) am 27535d19: DO NOT MERGE Prevent loading javascript: ...John Reck2011-06-230-0/+0
|\ \ \
| * \ \ am 27535d19: DO NOT MERGE Prevent loading javascript: uris in existing tabsJohn Reck2011-06-222-2/+9
| |\ \ \
| | * | | DO NOT MERGE Prevent loading javascript: uris in existing tabsJohn Reck2011-06-212-2/+9
* | | | | am a0237aad: (-s ours) am 2b6699b9: (-s ours) am 096bae24: DO NOT MERGE Preve...John Reck2011-06-230-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | am 2b6699b9: (-s ours) am 096bae24: DO NOT MERGE Prevent loading javascript: ...John Reck2011-06-210-0/+0
| |\ \ \ \
| | * \ \ \ am 096bae24: DO NOT MERGE Prevent loading javascript: uris in existing tabsJohn Reck2011-06-211-2/+9
| | |\ \ \ \
| | | * | | | DO NOT MERGE Prevent loading javascript: uris in existing tabsJohn Reck2011-06-211-2/+9
* | | | | | | am 23918ce9: (-s ours) am 09b16912: DO NOT MERGE Prevent webview re-useJohn Reck2011-06-230-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 09b16912: DO NOT MERGE Prevent webview re-useJohn Reck2011-06-211-4/+1
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | DO NOT MERGE Prevent webview re-useJohn Reck2011-06-211-4/+1
* | | | | | | am 4e8ff477: (-s ours) am a667e0fb: (-s ours) am d0750cb5: Merge "DO NOT MERG...Maarten Hooft2011-06-230-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | / / | |_|_|_|/ / |/| | | | |
| * | | | | am a667e0fb: (-s ours) am d0750cb5: Merge "DO NOT MERGE Security fix" into gi...Maarten Hooft2011-06-210-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | am d0750cb5: Merge "DO NOT MERGE Security fix" into gingerbreadMaarten Hooft2011-06-211-26/+23
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Merge "DO NOT MERGE Security fix" into gingerbreadMaarten Hooft2011-06-211-26/+23
| | | |\ \ \
| | | | * | | DO NOT MERGE Security fixJohn Reck2011-06-201-26/+23
* | | | | | | Handle restore dialog cancelJohn Reck2011-06-221-0/+7
* | | | | | | Implement scroll up trigger titlebarJohn Reck2011-06-225-30/+79