summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | am f4f58054: Import translations. DO NOT MERGEEric Fischer2012-06-011-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'f4f58054863590fd74ca618650a1c685e344ec70': Import translations. DO NOT MERGE
| | * | | | | Import translations. DO NOT MERGEEric Fischer2012-06-011-1/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | Change-Id: If95d90dee051d663f80338d75ae5660cb1a3df80
* | | | | | Import translations. DO NOT MERGEEric Fischer2012-06-0116-31/+16
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib136e645574ce17d27d586bcd49c5848e955a442
* | | | | | am 9d6862fd: (-s ours) am 19276b6b: Import translations. DO NOT MERGEEric Fischer2012-05-310-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '9d6862fd9e333b90976df3df18523784f80fd99b': Import translations. DO NOT MERGE
| * | | | | am 19276b6b: Import translations. DO NOT MERGEEric Fischer2012-05-311-1/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '19276b6b3ffe8864510b65ac6cad441c9b674fea': Import translations. DO NOT MERGE
| | * | | | Import translations. DO NOT MERGEEric Fischer2012-05-311-1/+1
| | |/ / / | | | | | | | | | | | | | | | Change-Id: Ieebdab18b84d1705fed6a3af5f2d94ce70be727f
* | | | | Import translations. DO NOT MERGEEric Fischer2012-05-316-13/+7
| | | | | | | | | | | | | | | | | | | | Change-Id: Idfa14e2825477830d671bc978da73fdebd876428
* | | | | am 48b66727: am ed19512a: Merge "Add null check" into jb-devJohn Reck2012-05-301-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '48b66727485a789489568ad4fe0392c8d3f8e52d': Add null check
| * | | | am ed19512a: Merge "Add null check" into jb-devJohn Reck2012-05-301-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'ed19512a329e66afaf48c8346b823e5fcc73bd02': Add null check
| | * | | Merge "Add null check" into jb-devJohn Reck2012-05-301-1/+1
| | |\ \ \
| | | * | | Add null checkJohn Reck2012-05-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6584413 Change-Id: I63e94129fb0830e87d47ffca1d402a8aa838ac20
* | | | | | am 29457a67: (-s ours) am d6bea1eb: Merge "Import translations. DO NOT ↵Eric Fischer2012-05-300-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE" into jb-dev * commit '29457a67e8a8dcd4600a4ea50a3c092a0559a962': Import translations. DO NOT MERGE
| * | | | | am d6bea1eb: Merge "Import translations. DO NOT MERGE" into jb-devEric Fischer2012-05-302-16/+16
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'd6bea1ebe54aac57625b9ae6784d677ce56eec83': Import translations. DO NOT MERGE
| | * | | | Merge "Import translations. DO NOT MERGE" into jb-devEric Fischer2012-05-302-16/+16
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Import translations. DO NOT MERGEEric Fischer2012-05-302-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9390d004cfae9d8836e459870daa98a144cb0a05
* | | | | | Merge "Import translations. DO NOT MERGE"Eric Fischer2012-05-3024-66/+43
|\ \ \ \ \ \
| * | | | | | Import translations. DO NOT MERGEEric Fischer2012-05-3024-66/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I273cb1f79fee61f9ed7f26482d007217b62edefc
* | | | | | | am 0c5933fe: am 244cdfa6: Merge "Prevent the monkies with a sledgehammer" ↵John Reck2012-05-304-52/+302
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-dev * commit '0c5933fe14a9c028055139375fc177221bc4ee82': Prevent the monkies with a sledgehammer
| * | | | | | am 244cdfa6: Merge "Prevent the monkies with a sledgehammer" into jb-devJohn Reck2012-05-304-52/+302
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | * commit '244cdfa6eb0745a4b681cb704f5564050d88f7ed': Prevent the monkies with a sledgehammer
| | * | | | | Merge "Prevent the monkies with a sledgehammer" into jb-devJohn Reck2012-05-304-52/+302
| | |\ \ \ \ \
| | | * | | | | Prevent the monkies with a sledgehammerJohn Reck2012-05-304-52/+302
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6515134 If we never have a null mController, we can never have a NPE! Change-Id: Idf90b94e6557e0afd6dd92602b8e4dfd189218d1
* | | | | | | | am 5c1e9e1a: am f788adcf: Merge "Make sure focusSearch doesn\'t return a ↵John Reck2012-05-301-2/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | detached webview" into jb-dev * commit '5c1e9e1adaac9de35a0cf5976f6a78d178d3e2be': Make sure focusSearch doesn't return a detached webview
| * | | | | | | am f788adcf: Merge "Make sure focusSearch doesn\'t return a detached ↵John Reck2012-05-301-2/+4
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | webview" into jb-dev * commit 'f788adcf8b3be878d174f5b7c2396c0d19540d7f': Make sure focusSearch doesn't return a detached webview
| | * | | | | | Merge "Make sure focusSearch doesn't return a detached webview" into jb-devJohn Reck2012-05-301-2/+4
| | |\ \ \ \ \ \
| | | * | | | | | Make sure focusSearch doesn't return a detached webviewJohn Reck2012-05-301-2/+4
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6535227 Change-Id: I18bf24117d8ffcbbd440b2a47b2db422e41894f4
* | | | | | | | am 9ba16e8d: Reconcile with jb-releaseThe Android Open Source Project2012-05-300-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | * commit '9ba16e8dd1107646ef408b051572eed241831c74':
| * | | | | | | Reconcile with jb-releaseThe Android Open Source Project2012-05-300-0/+0
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | | | | | | | | Change-Id: I8d1db6d558f2de1084a006bd2d63d2afe3b08318
| | * | | | | | merge in jb-release history after reset to jb-devThe Android Automerger2012-05-300-0/+0
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
* | | | | | | | am 5f51df7f: am 06b7e0fa: Merge "tighten nav bar layout & fix animation bug" ↵Michael Kolb2012-05-304-22/+45
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | / / / | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | into jb-dev * commit '5f51df7f18e8fe9319b45eaf095511f7aa95aa44': tighten nav bar layout & fix animation bug
| * | | | | | am 06b7e0fa: Merge "tighten nav bar layout & fix animation bug" into jb-devMichael Kolb2012-05-304-22/+45
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | * commit '06b7e0fafdee08f7045f419b19eb1aacb00d7d60': tighten nav bar layout & fix animation bug
| | * | | | | Merge "tighten nav bar layout & fix animation bug" into jb-devMichael Kolb2012-05-304-22/+45
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | | * | | | tighten nav bar layout & fix animation bugMichael Kolb2012-05-294-22/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6563289 Change-Id: I00fdecf645128bb1fec8e23be94aa2b85fb586f7
* | | | | | | 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