summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 6d54d6a6: (-s ours) Merge "Import revised translations. DO NOT MERGE" ↵Eric Fischer2011-10-270-0/+0
|\ | | | | | | | | | | | | into ics-mr1 * commit '6d54d6a615875cf65c4875dacac52d8eeeb9a341': Import revised translations. DO NOT MERGE
| * 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
| | | | | | | | | | | | Change-Id: I9bc047d8fe7b9566844e0d34e5bed874926db272
* | | am 79e36dbe: Merge "Add new default bookmark" into ics-mr1John Reck2011-10-273-0/+7
|\ \ \ | |/ / | | | | | | | | | * commit '79e36dbe90997dbd2d276241bfac8cc2c2bac9f0': Add new default bookmark
| * | Merge "Add new default bookmark" into ics-mr1John Reck2011-10-273-0/+7
| |\ \
| | * | Add new default bookmarkJohn Reck2011-10-263-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 5479018 Change-Id: Iedb8cffcf35d5f1ba98ac34e0b724c4235cb7d38
* | | | Fix monkey crash in AutofillSettingsFragment.Ben Murdoch2011-10-271-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's possible to trigger the options menu before the views are fully inflated if you're really fast like the monkey. Bug: 5518582 Change-Id: I86402cc1df70289d9f0685a5c9949ac38fbd9cd0
* | | | am 945c1806: (-s ours) am 5cb45e38: (-s ours) Import revised translations. ↵Eric Fischer2011-10-260-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | DO NOT MERGE * commit '945c1806798c0e8361e44351e828227d4db5b034': Import revised translations. DO NOT MERGE
| * | | am 5cb45e38: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-10-260-0/+0
| |\ \ \ | | |_|/ | |/| | | | | | | | | | * commit '5cb45e3871a4d10c9230d3de8d43a96ebed1d2d4': Import revised translations. DO NOT MERGE
| | * | Import revised translations. DO NOT MERGEEric Fischer2011-10-265-45/+45
| | | | | | | | | | | | | | | | Change-Id: I6b1bd3148ce89dfb88a93c815c67b14a8a9245f6
* | | | am cd919f1b: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-10-260-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'cd919f1b718b1c058ab593ff55e0ade510711f75': Import revised translations. DO NOT MERGE
| * | | Import revised translations. DO NOT MERGEEric Fischer2011-10-2614-98/+98
| | |/ | |/| | | | | | | Change-Id: Ifb74ac66d088f21e215406c99975c5139f619ab1
* | | am 7f2b28c8: (-s ours) merge ics-mr0Ed Heyl2011-10-260-0/+0
|\ \ \ | |/ / | | | | | | * commit '7f2b28c8a5c92dff6a85d1f17a3b5d52c0429611':
| * | merge ics-mr0Ed Heyl2011-10-255-20/+42
| |\ \ | | |/ | | | | | | Change-Id: Ifc31b8464766d17b2f46183cbe0e7309445b07dc
* | | Merge "Import revised translations."Eric Fischer2011-10-2512-72/+72
|\ \ \
| * | | Import revised translations.Eric Fischer2011-10-2512-72/+72
| |/ / | | | | | | | | | Change-Id: I6b62f58997f2824f10c6960180031f6506201608
* | | Reconcile with ics-mr0-releaseThe Android Open Source Project2011-10-250-0/+0
|\ \ \ | | | | | | | | | | | | Change-Id: Ic9c1f854ee1354561f95361401cc9ab6755f4355
| * \ \ merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-240-0/+0
| |\ \ \ | | |_|/ | |/| |
* | | | Merge "Fix Autofill profile editor UI."Ben Murdoch2011-10-255-275/+120
|\ \ \ \
| * | | | Fix Autofill profile editor UI.Ben Murdoch2011-10-205-275/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the save button into the action bar to conserve space. Update the IME options so that we don't enter extract mode. Bug: 5210430 Change-Id: I0c5d6c200071130c9b6ed19a1def7ac0fd42ac10
* | | | | Reconcile with ics-mr0-releaseThe Android Open Source Project2011-10-240-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | Change-Id: Ied1258293bb457be02696acb94aaa0591f8679dc
| * | | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-240-0/+0
| |\ \ \ \
* | \ \ \ \ am 7af87583: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-10-240-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | * commit '7af87583a7c732b1f1a7dbe46f446444b77440a5': Import revised translations. DO NOT MERGE
| * | | | | Import revised translations. DO NOT MERGEEric Fischer2011-10-245-23/+23
| |/ / / / | | | | | | | | | | | | | | | Change-Id: Id0a01ecff491a0147ccb9cbab5ac8b45903b7481
* | | | | resolved conflicts for merge of cde9b959 to masterJohn Reck2011-10-242-3/+25
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | | Change-Id: I0f3c18d6cfffb286098357e7643bc4f1d6fc9239
| * | | Merge "Use UTF-8 for font size preview" into ics-mr0John Reck2011-10-242-3/+25
| |\ \ \
| | * | | Use UTF-8 for font size previewJohn Reck2011-10-212-3/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5489018 Apparantly ASCII isn't good enough Change-Id: I9402c7c3e1ceedc26822469b652166885a40d6e3
* | | | | Reconcile with ics-mr0-releaseThe Android Open Source Project2011-10-240-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | Change-Id: I4539d65f411a9a9acf6eb998e9aa6d5b4e0a1368
| * | | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-210-0/+0
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-210-0/+0
| | |\ \ \
| | | * \ \ merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-200-0/+0
| | | |\ \ \ | | | | |/ / | | | |/| |
* | | | | | am 1eb7d122: Merge "Fix fullscreen mode" into ics-mr0Michael Kolb2011-10-211-5/+19
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '1eb7d1224fafa2c7f327c808cf6eec6269297493': Fix fullscreen mode
| * | | | | Merge "Fix fullscreen mode" into ics-mr0Michael Kolb2011-10-211-5/+19
| |\ \ \ \ \
| | * | | | | Fix fullscreen modeMichael Kolb2011-10-211-5/+19
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5494143 Set fullscreen flags on window hide system UI Change-Id: I38714fd3973d2ee0baca51eb89f0ca640cbab225
* | | | | | am ad52bc77: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-10-210-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'ad52bc77f967bcdad22b3e0de1b7518766bf1d3c': Import revised translations. DO NOT MERGE
| * | | | | Import revised translations. DO NOT MERGEEric Fischer2011-10-211-6/+6
| | |/ / / | |/| | | | | | | | | | | | | Change-Id: I7ad0ca27cf77589f5fc6ff66818b59daaa9ef3e5
* | | | | am 42d362a2: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-10-210-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '42d362a282e99d4eb876f1906a5ee7fee4316ed3': Import revised translations. DO NOT MERGE
| * | | | Import revised translations. DO NOT MERGEEric Fischer2011-10-203-31/+31
| |/ / / | | | | | | | | | | | | Change-Id: Ie4dd3aff98da1489ee0d9929cbf24b89eb831196
* | | | am 59bf8725: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-10-200-0/+0
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | * commit '59bf8725cfa019effc19b8fdcdeb117a7f710755': Import revised translations. DO NOT MERGE
| * | Import revised translations. DO NOT MERGEEric Fischer2011-10-205-13/+13
| | | | | | | | | | | | Change-Id: I3a1d0b21edcf98759bf205dbd5f627b55b52d75a
* | | Reconcile with ics-mr0-releaseThe Android Open Source Project2011-10-190-0/+0
|\ \ \ | | |/ | |/| | | | Change-Id: I1c48be157499d190ee24c7fbdc45a1839025761b
| * | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-190-0/+0
| |\ \ | | |/ | |/|
| | * merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-180-0/+0
| | |\
* | | \ am ce937c5f: Merge "fix tab out animation bug" into ics-mr0John Reck2011-10-182-73/+113
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'ce937c5f62b1f0b3091a123c1870377818744b52': fix tab out animation bug
| * | | Merge "fix tab out animation bug" into ics-mr0John Reck2011-10-182-73/+113
| |\ \ \ | | |/ / | |/| |
| | * | fix tab out animation bugMichael Kolb2011-10-182-73/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5464898 Changed out animation for collapsing and scrolling Change-Id: I4a14bcb63aba9b9498a3e7835aa98d4c8312f00a
* | | | Merge "Import revised translations."Eric Fischer2011-10-1847-1784/+607
|\ \ \ \
| * | | | Import revised translations.Eric Fischer2011-10-1847-1784/+607
| | | | | | | | | | | | | | | | | | | | Change-Id: Ibf03714cd50760719911af7ff4aad92fd61e2de7
* | | | | am 070aaeed: (-s ours) Merge "Import revised translations. DO NOT MERGE" ↵Eric Fischer2011-10-180-0/+0
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | into ics-mr0 * commit '070aaeed9320d1cc1b4b0a9971a06f3ba049d2d4': Import revised translations. DO NOT MERGE
| * | | | Merge "Import revised translations. DO NOT MERGE" into ics-mr0Eric Fischer2011-10-1846-222/+600
| |\ \ \ \
generated by cgit v1.1 at 2024-12-25 17:03:08 +0000