summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am fc0fbd1f: am d213f5c9: Merge "Revert "Fix assets and layout for popup ↵Bart Sears2011-12-121-11/+16
|\ | | | | | | | | | | | | window"" into ics-mr1 * commit 'fc0fbd1fbf655f712cd7af912fe241ff708fe24c': Revert "Fix assets and layout for popup window"
| * am d213f5c9: Merge "Revert "Fix assets and layout for popup window"" into ↵Bart Sears2011-12-121-11/+16
| |\ | | | | | | | | | | | | | | | | | | ics-mr1 * commit 'd213f5c9ce56a74acb6efe880c943d3f96a6af95': Revert "Fix assets and layout for popup window"
| | * Merge "Revert "Fix assets and layout for popup window"" into ics-mr1Bart Sears2011-12-121-11/+16
| | |\
| | | * Revert "Fix assets and layout for popup window"Bart Sears2011-12-121-11/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Top bar with Close button blocks the top of popup window Bug 5747741 This reverts commit 4e29b3db13ca69c5fa92a146c02aa22d5730343c
* | | | am 071222d9: Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-090-0/+0
|\ \ \ \ | |/ / / | | | | | | | | * commit '071222d913b2e5645f058b1e278de70de977c09c':
| * | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-080-0/+0
| |\ \ \ | | |/ / | |/| | | | | | Change-Id: Ia60d29acdf49193e3f4a950fdfbf187592305aac
* | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-070-0/+0
|\ \ \ \ | | |/ / | |/| | | | | | Change-Id: I5dc5f4d1a72b6aebe870a833c84e575120c78cdf
| * | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-060-0/+0
| |\ \ \ | | |/ / | |/| |
* | | | am 06d107fc: Merge "Remove even more unnecessary flag" into ics-mr1Bart Sears2011-12-061-2/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '06d107fc963a451415e7ffdbf72e34198d85fc35': Remove even more unnecessary flag
| * | | Merge "Remove even more unnecessary flag" into ics-mr1Bart Sears2011-12-061-2/+1
| |\ \ \
| | * | | Remove even more unnecessary flagMichael Kolb2011-12-061-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5715053 The flag added earlier caused a screen blackout on stingray. Change-Id: Ia1400111c4a53a1803f92549c4da73e3715cfe15
* | | | | am d87416e5: (-s ours) Merge "Import revised translations. DO NOT MERGE" ↵Eric Fischer2011-12-060-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr1 * commit 'd87416e5cee1a600908f57230d8343111addcae3': Import revised translations. DO NOT MERGE
| * | | | Merge "Import revised translations. DO NOT MERGE" into ics-mr1Eric Fischer2011-12-061-1/+1
| |\ \ \ \
| | * | | | Import revised translations. DO NOT MERGEEric Fischer2011-12-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8844c1d538dd0d549057c6795fda11b8142f356d
* | | | | | am b2c167de: (-s ours) Fix text field next/done action in Autofill editor. ↵Ben Murdoch2011-12-060-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not merge. * commit 'b2c167de261c6c24421a64e3fa612d8d9234123b': Fix text field next/done action in Autofill editor. Do not merge.
| * | | | | Fix text field next/done action in Autofill editor. Do not merge.Ben Murdoch2011-12-062-20/+40
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explicitly add the necessary imeOptions to the Autofill profile editor text fields. Bug: 5631859 Change-Id: I33e49fad388358a8f19c599e7e1e785fe951e1a6
* | | | | Merge "Explicity specify IME action key behavior for Autofill profile editor."Ben Murdoch2011-12-063-3/+5
|\ \ \ \ \
| * | | | | Explicity specify IME action key behavior for Autofill profile editor.Ben Murdoch2011-12-063-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5631859 Change-Id: I43dec2396bc467b3f3244e68c140ce1930c0da84
* | | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-060-0/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | | Change-Id: I0744cb47040113f10574e458f604d92bcb2a3fce
| * | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-050-0/+0
| |\ \ \ \ | | |/ / / | |/| | |
* | | | | am 0d0245ff: Add Bookmarks option to phone menuMichael Kolb2011-12-053-0/+21
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '0d0245ffd51825f90a9df883667a71e500da03fa': Add Bookmarks option to phone menu
| * | | | Add Bookmarks option to phone menuMichael Kolb2011-12-053-0/+21
| | |/ / | |/| | | | | | | | | | | | | | | | | | Bug: 5713465 Change-Id: I7a260ea5138efca9b4f8ac461a03207480b438df
* | | | am 861d52c8: Merge "Remove unnecessary flags" into ics-mr1Michael Kolb2011-12-051-11/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '861d52c80430edeb0eba6f73cd0e206e27f4ac6b': Remove unnecessary flags
| * | | Merge "Remove unnecessary flags" into ics-mr1Michael Kolb2011-12-051-11/+2
| |\ \ \
| | * | | Remove unnecessary flagsMichael Kolb2011-12-021-11/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5494143 handled by HTML5FullScreenView now Change-Id: Ifdf3d0e2835acde856a9278d03f91a6ed4089b37
* | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-050-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | Change-Id: I04a6f05c85ac8185bb1c56fbc25d6af97d423123
| * | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-020-0/+0
| |\ \ \ \ | | |/ / / | |/| | |
* | | | | am 31ae2cc1: Switch BP1->2 upgrade to best effortJohn Reck2011-12-021-6/+12
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '31ae2cc171ed6355d958ea05501ce6e7ef0ad223': Switch BP1->2 upgrade to best effort
| * | | | Switch BP1->2 upgrade to best effortJohn Reck2011-12-021-6/+12
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5705036 Prefer a partial upgrade or loss of data over crashing if the data we are upgrading from fails constraint checks Change-Id: I0ad52278b61be73dc7d1201a8bde63fa667f2a2b
* | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-11-300-0/+0
|\ \ \ \ | | |/ / | |/| | | | | | Change-Id: I7cb3597995d8f720bb763685253e2c22b4370572
| * | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-300-0/+0
| |\ \ \ | | |/ / | |/| |
| | * | Fix yet another Monkey NPEMichael Kolb2011-11-291-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 5685380 Change-Id: Ida841160df6e76318ebb8e2b3804a40184b96161
| | * | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-290-0/+0
| | |\ \
| | | * \ merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-280-0/+0
| | | |\ \
* | | | \ \ am c5b0b2db: Fix yet another Monkey NPEMichael Kolb2011-11-301-1/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'c5b0b2db3b917e658700642763fb50da0057716b': Fix yet another Monkey NPE
| * | | | | Fix yet another Monkey NPEMichael Kolb2011-11-291-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5685380 Change-Id: Ida841160df6e76318ebb8e2b3804a40184b96161
* | | | | | am a3317918: (-s ours) Merge "Import revised translations. DO NOT MERGE" ↵Eric Fischer2011-11-290-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr1 * commit 'a33179189aae473eeb4d2c5d239c5a5caee66598': Import revised translations. DO NOT MERGE
| * | | | | Merge "Import revised translations. DO NOT MERGE" into ics-mr1Eric Fischer2011-11-297-15/+15
| |\ \ \ \ \
| | * | | | | Import revised translations. DO NOT MERGEEric Fischer2011-11-297-15/+15
| | | |/ / / | | |/| | | | | | | | | | | | | | | Change-Id: I3ff1c88e234ab8c71a48bfb1d51321206f0c8610
* | | | | | am 3055c766: Merge "Add application launch category." into ics-mr1Jeff Brown2011-11-291-0/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '3055c7665a0ad0c279d0d3e3f166199d610591a8': Add application launch category.
| * | | | | Merge "Add application launch category." into ics-mr1Jeff Brown2011-11-291-0/+1
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Add application launch category.Jeff Brown2011-11-281-0/+1
| | |/ / / | | | | | | | | | | | | | | | | | | | | Bug: 5674723 Change-Id: I81f88853c5a6756927d528305c73e98c2ac26db2
* | | | | Merge "Import revised translations."Eric Fischer2011-11-2947-148/+148
|\ \ \ \ \
| * | | | | Import revised translations.Eric Fischer2011-11-2947-148/+148
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie689583ac628cacdc259b84c1d5cd5e1927b454f
* | | | | | am 7431a694: Merge "Fix NPE at startup" into ics-mr1Bart Sears2011-11-281-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | | | | | * commit '7431a694054d56b5d56410f708f97bc2a81ae5e3': Fix NPE at startup
| * | | | Merge "Fix NPE at startup" into ics-mr1Bart Sears2011-11-281-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix NPE at startupMichael Kolb2011-11-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5676863 Change-Id: I673699e577f0ed2cfa85260f905ccccc0d852399
* | | | | Merge "Remove an init. workaround for Cookiemanager."Selim Gurun2011-11-231-2/+0
|\ \ \ \ \
| * | | | | Remove an init. workaround for Cookiemanager.Selim Gurun2011-11-211-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug:5253777 This workaround is now not necessary as we not do not block while accessing cookie manager settings. Change-Id: I7b1df4b60124123b6493a0320d2d96dfdd8d2c29
* | | | | | Merge "Crash recover no longer uses icicle."George Mount2011-11-235-98/+162
|\ \ \ \ \ \
generated by cgit v1.1 at 2024-12-25 09:50:48 +0000