summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 8f839914: am 41597569: Merge "Only change text in url input when it ↵Michael Kolb2012-05-301-1/+3
|\ | | | | | | | | | | | | changed" into jb-dev * commit '8f8399146b3d869dd2af5bef95a38c63878137a0': Only change text in url input when it changed
| * am 41597569: Merge "Only change text in url input when it changed" into jb-devMichael Kolb2012-05-301-1/+3
| |\ | | | | | | | | | | | | * commit '4159756953c0ada88f774828d6a1f329564d222b': Only change text in url input when it changed
| | * Merge "Only change text in url input when it changed" into jb-devMichael Kolb2012-05-301-1/+3
| | |\
| | | * Only change text in url input when it changedMichael Kolb2012-05-291-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 6556693 Change-Id: Iad0f285f89710de1bbdf7ab5f727bdc81d4ef387
* | | | am 70c81f60: am e7ac37e7: Update to follow internal impl.Dianne Hackborn2012-05-291-0/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '70c81f606e3f0d781e57d72fa8a1d49331709b70': Update to follow internal impl.
| * | | am e7ac37e7: Update to follow internal impl.Dianne Hackborn2012-05-291-0/+4
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'e7ac37e77ad8605b5e730fe48f088bb77df4b57a': Update to follow internal impl.
| | * | Update to follow internal impl.Dianne Hackborn2012-05-291-0/+4
| | | | | | | | | | | | | | | | Change-Id: I40cae53d7ae724c44c40fb7f21649e807416ae54
* | | | am 950ace67: (-s ours) am 02e9618c: Import translations. DO NOT MERGEEric Fischer2012-05-290-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '950ace6772f6b9bd1b861771bff4b12d3f12aa3f': Import translations. DO NOT MERGE
| * | | am 02e9618c: Import translations. DO NOT MERGEEric Fischer2012-05-292-4/+4
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '02e9618ce3a54bc120697c05f9555c0a6a7ea502': Import translations. DO NOT MERGE
| | * | Import translations. DO NOT MERGEEric Fischer2012-05-292-4/+4
| | |/ | | | | | | | | | Change-Id: Ib9b9f062988f60cb1c551068926e77a5c31dabc7
* | | am 1501e50a: Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-290-0/+0
|\ \ \ | |/ / | | | | | | * commit '1501e50a1680bb24aca39b5021dd3e81bc30c9c2':
| | |
| | \
| *-. \ Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-290-0/+0
| |\ \ \ | | | | | | | | | | | | | | | Change-Id: I1c097ce113edfc5de25039b70439131d9c0dcdeb
| | | * \ merge in nakasi-factoryrom-release history after reset to jb-devThe Android Automerger2012-05-240-0/+0
| | | |\ \
| | * | \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-05-290-0/+0
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
* | | | | | am 3f7afd8f: (-s ours) am 070a0c79: Import translations. DO NOT MERGEEric Fischer2012-05-250-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '3f7afd8fdee1ae7c748710d5ad46f5d71521d01d': Import translations. DO NOT MERGE
| * | | | | am 070a0c79: Import translations. DO NOT MERGEEric Fischer2012-05-2549-29/+79
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '070a0c79c3c6498c2b05c9ad1f4c93b13c46382c': Import translations. DO NOT MERGE
| | * | | | Import translations. DO NOT MERGEEric Fischer2012-05-2549-29/+79
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I888f6ce252872b1871c9ce6bdec0d3e420150699
* | | | | | Import translations. DO NOT MERGEEric Fischer2012-05-2549-29/+177
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I992f88ea019bd90520c931e40dfec7c8b64ed4b9
* | | | | | am b1e24660: am f695f6b4: Tell Browser to monitor the WebCore thread for ↵Ben Murdoch2012-05-241-0/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | responsiveness. * commit 'b1e24660559414b2128a2138c273989b3d34685b': Tell Browser to monitor the WebCore thread for responsiveness.
| * | | | | am f695f6b4: Tell Browser to monitor the WebCore thread for responsiveness.Ben Murdoch2012-05-241-0/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'f695f6b4399f3a60a5d9d0aa39b8c341e8b8592a': Tell Browser to monitor the WebCore thread for responsiveness.
| | * | | | Tell Browser to monitor the WebCore thread for responsiveness.Ben Murdoch2012-05-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We no longer enable the WebCore thread watchdog for all WebViews, but we still want the functionality in Browser. Bug: 6447214 Change-Id: I1665bef875d53239203bc6313ac39af4bda6a60b
* | | | | | am 86d8ff31: Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-240-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | * commit '86d8ff31edbaef1a0cc40991b7452026c7ff350b':
| | | | | |
| | \ \ \ \
| *-. \ \ \ \ Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-240-0/+0
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | / | | | | |_|/ | | | |/| | Change-Id: I0d6a14cf398ec8b8bed5022a40d030aeca8b8006
| | | * | | merge in nakasi-factoryrom-release history after reset to jb-devThe Android Automerger2012-05-220-0/+0
| | | |\ \ \
| | * | \ \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-05-240-0/+0
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | / | | | | |_|/ | | | |/| |
| | | * | | merge in jb-release history after reset to jb-devThe Android Automerger2012-05-230-0/+0
| | | |\ \ \
* | | | \ \ \ am 0409ff5e: am c90effde: Merge "Disable fixed title bar in quick controls" ↵John Reck2012-05-231-3/+8
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-dev * commit '0409ff5ea04e0bfe556cde5ff0c46e4786509616': Disable fixed title bar in quick controls
| * | | | | | am c90effde: Merge "Disable fixed title bar in quick controls" into jb-devJohn Reck2012-05-231-3/+8
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'c90effdedc1c38eabc2c731d5a55c17f881862b1': Disable fixed title bar in quick controls
| | * | | | | Merge "Disable fixed title bar in quick controls" into jb-devJohn Reck2012-05-231-3/+8
| | |\ \ \ \ \
| | | * | | | | Disable fixed title bar in quick controlsJohn Reck2012-05-231-3/+8
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6546959 Change-Id: I7511497869ddf7b5107d73c378b88a6363d08ce6
* | | | | | | am 7e7fefa9: am e7699eaa: Updating launcher icon to fix alignment. Bug: 6511716Christian Robertson2012-05-233-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '7e7fefa95c8be07fe2bd295f44ceb2156748970c': Updating launcher icon to fix alignment. Bug: 6511716
| * | | | | | am e7699eaa: Updating launcher icon to fix alignment. Bug: 6511716Christian Robertson2012-05-233-0/+0
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'e7699eaafc4d70af2ad55c6badffd090712019a2': Updating launcher icon to fix alignment. Bug: 6511716
| | * | | | | Updating launcher icon to fix alignment. Bug: 6511716Christian Robertson2012-05-233-0/+0
| | |/ / / / | | | | | | | | | | | | | | | | | | Change-Id: I8b68bf515150c163640bcf668fee79ed54208aef
* | | | | | am c4390e23: am af58d393: Explicitly use adjustResize for AddBookmarkPageJohn Reck2012-05-221-1/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'c4390e233e2d83cc09c054bfd1b381c479b887ff': Explicitly use adjustResize for AddBookmarkPage
| * | | | | am af58d393: Explicitly use adjustResize for AddBookmarkPageJohn Reck2012-05-221-1/+2
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'af58d393e3c62a946ffd434e857819521dc01a28': Explicitly use adjustResize for AddBookmarkPage
| | * | | | Explicitly use adjustResize for AddBookmarkPageJohn Reck2012-05-221-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6516239 Change-Id: I8171bb529a04951bc3a112fa67fc2570882cef56
* | | | | | am 45533a34: Reconcile with jb-releaseThe Android Open Source Project2012-05-220-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | * commit '45533a345d5218f131fb5fae95efa4a1e524a0d2':
| * | | | | Reconcile with jb-releaseThe Android Open Source Project2012-05-220-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | Change-Id: Ifc574ebc9a62e9f0b6dd48d93866b0d044503bfc
| | * | | | merge in jb-release history after reset to jb-devThe Android Automerger2012-05-220-0/+0
| | |\ \ \ \ | | | |/ / / | | |/| / / | | | |/ /
| | | * | merge in jb-release history after reset to jb-devThe Android Automerger2012-05-200-0/+0
| | | |\ \
* | | | \ \ am c2ef275b: am 57b7b8a3: Merge "Fix portrait\'s fixed title bar" into jb-devJohn Reck2012-05-214-26/+123
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'c2ef275bafd079554943073e0518f1ae22866ab7': Fix portrait's fixed title bar
| * | | | | am 57b7b8a3: Merge "Fix portrait\'s fixed title bar" into jb-devJohn Reck2012-05-214-26/+123
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '57b7b8a301dcfd1686396ce118526c8a7e2d4245': Fix portrait's fixed title bar
| | * | | | Merge "Fix portrait's fixed title bar" into jb-devJohn Reck2012-05-214-26/+123
| | |\ \ \ \
| | | * | | | Fix portrait's fixed title barJohn Reck2012-05-184-26/+123
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6468013 Change-Id: Ia6ee9645df9ebb8aa98734efef45b57db94651f7
* | | | | | am 4bea6761: am e788ab51: Merge "Increase char limit on tab setting" into jb-devMichael Kolb2012-05-211-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '4bea6761ab4a7e0e817d37c5485814e6d08c1a16': Increase char limit on tab setting
| * | | | | am e788ab51: Merge "Increase char limit on tab setting" into jb-devMichael Kolb2012-05-211-1/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'e788ab51d6b38ecbb9ea0c9b0126a286d597a5fb': Increase char limit on tab setting
| | * | | | Merge "Increase char limit on tab setting" into jb-devMichael Kolb2012-05-211-1/+1
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Increase char limit on tab settingMichael Kolb2012-05-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6522503 Change-Id: I931ad26b5ebed41e9dac9036bde37ef03ef1e596
* | | | | | am 850d1013: Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-210-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | * commit '850d1013e96d074051950c9ffc4cbdebaafdf4f9':
| | | | | |
| | \ \ \ \
| *-. \ \ \ \ Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-180-0/+0
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | / | | | | |_|/ | | | |/| | Change-Id: I79f1d759c0aaac8ca18ed91c49f554db44272fc9
generated by cgit v1.1 at 2025-01-12 23:37:48 +0000