summaryrefslogtreecommitdiffstats
path: root/core/java
Commit message (Expand)AuthorAgeFilesLines
* merge from open-source masterThe Android Open Source Project2010-05-033-23/+47
|\
| * Parse custom text header and ignore it.takuo2010-04-301-0/+11
| * Parse "multipart/vnd.wap.multipart.alternative" which is a part of multipart ...takuo2010-04-302-17/+26
| * Fix an NPE in InputMethodService when mExtractAction is null.Steve Kondik2010-04-281-6/+10
* | am 794cd640: Merge "Expose _id in ExtendedProperties subValues" into froyoMarc Blank2010-04-291-3/+7
|\ \
| * | Expose _id in ExtendedProperties subValuesMarc Blank2010-04-291-3/+7
* | | am b40c42f1: Fix bug 2639949 - Don\'t stop a Scroller earlyAdam Powell2010-04-281-7/+0
|\ \ \ | |/ /
| * | Fix bug 2639949 - Don't stop a Scroller earlyAdam Powell2010-04-281-7/+0
* | | am 81ac367b: Merge "Fix a minor bug in transitions to left-edge-up landscape....Steve Howard2010-04-281-1/+1
|\ \ \ | |/ /
| * | Merge "Fix a minor bug in transitions to left-edge-up landscape." into froyoSteve Howard2010-04-281-1/+1
| |\ \
| | * | Fix a minor bug in transitions to left-edge-up landscape.Steve Howard2010-04-281-1/+1
* | | | am a07c4cbe: Merge "bug:2622719 move \'forcing of cursor execution\' to Cont...Vasu Nori2010-04-282-7/+9
|\ \ \ \ | |/ / /
| * | | bug:2622719 move 'forcing of cursor execution' to ContentProviderVasu Nori2010-04-282-7/+9
* | | | am 9aaf24f2: Merge "revert a change in the SyncManager that caused it to not ...Fred Quintana2010-04-281-5/+1
|\ \ \ \ | |/ / /
| * | | Merge "revert a change in the SyncManager that caused it to not cancel long r...Fred Quintana2010-04-281-5/+1
| |\ \ \ | | |/ / | |/| |
| | * | revert a change in the SyncManager that caused it to not cancelFred Quintana2010-04-271-5/+1
* | | | am 996960de: Merge "remove myname accidentally included in one of the files" ...Vasu Nori2010-04-271-2/+0
|\ \ \ \ | |/ / /
| * | | Merge "remove myname accidentally included in one of the files" into froyoVasu Nori2010-04-271-2/+0
| |\ \ \
| | * | | remove myname accidentally included in one of the filesVasu Nori2010-04-271-2/+0
* | | | | am e367896e: Merge "Fix issue #2594388: WallpaperService doesn\'t always call...Dianne Hackborn2010-04-271-29/+49
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Fix issue #2594388: WallpaperService doesn't always call onSurfaceDest...Dianne Hackborn2010-04-271-29/+49
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix issue #2594388: WallpaperService doesn't always call onSurfaceDestroyed()Dianne Hackborn2010-04-271-29/+49
* | | | | am 05fd7e7d: Add good international characters to the path part of Url pattern.Shimeng (Simon) Wang2010-04-271-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Add good international characters to the path part of Url pattern.Shimeng (Simon) Wang2010-04-271-1/+1
* | | | | am 2ea21a84: Merge "Fix a WebView scrolling regression - bug 2633572." into f...Adam Powell2010-04-271-0/+4
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Fix a WebView scrolling regression - bug 2633572." into froyoAdam Powell2010-04-271-0/+4
| |\ \ \ \
| | * | | | Fix a WebView scrolling regression - bug 2633572.Adam Powell2010-04-271-0/+4
| | |/ / /
* | | | | am 6ce78924: Merge "Add JavaDoc for SyncResult http://b/2420252" into froyoFred Quintana2010-04-272-3/+181
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Add JavaDoc for SyncResult http://b/2420252" into froyoFred Quintana2010-04-272-3/+181
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Add JavaDoc for SyncResultFred Quintana2010-04-272-3/+181
| | |/ /
* | | | am 2e4b98dc: Merge "Whoops a little more on issue #2631417: Expose FLAG_EXTER...Dianne Hackborn2010-04-261-1/+1
|\ \ \ \ | |/ / /
| * | | Whoops a little more on issue #2631417: Expose FLAG_EXTERNAL_STORAGEDianne Hackborn2010-04-261-1/+1
* | | | am 3202d380: Fix issue #2631417: Expose FLAG_EXTERNAL_STORAGEDianne Hackborn2010-04-261-8/+10
|\ \ \ \ | |/ / /
| * | | Fix issue #2631417: Expose FLAG_EXTERNAL_STORAGEDianne Hackborn2010-04-261-8/+10
* | | | am 8138cb49: Make Surface.toString() show more useful info to help debug bug ...Marco Nelissen2010-04-261-1/+5
|\ \ \ \ | |/ / /
| * | | Make Surface.toString() show more useful info to help debug bug 2594388.Marco Nelissen2010-04-261-1/+5
| |/ /
* | | am cb4c894a: Merge "bugfix for: OOM error while doing voice search repeatedly...Bjorn Bringert2010-04-262-25/+50
|\ \ \ | |/ /
| * | Merge "bugfix for: OOM error while doing voice search repeatedly" into froyoBjorn Bringert2010-04-262-25/+50
| |\ \
| | * | bugfix for: OOM error while doing voice search repeatedlyValentin Kravtsov2010-04-222-25/+50
* | | | am 87782f2b: Merge "Restrict the range request to the servers claiming that t...Grace Kloba2010-04-231-1/+4
|\ \ \ \ | |/ / /
| * | | Merge "Restrict the range request to the servers claiming that they accept ra...Grace Kloba2010-04-231-1/+4
| |\ \ \
| | * | | Restrict the range request to the servers claimingGrace Kloba2010-04-231-1/+4
* | | | | am 85a8dcec: Merge "Only honor the scrollbar mode at the minimum zoom level. ...Grace Kloba2010-04-231-2/+6
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Only honor the scrollbar mode at the minimum zoom level. This reduced ...Grace Kloba2010-04-231-2/+6
| |\ \ \ \
| | * | | | Only honor the scrollbar mode at the minimum zoomGrace Kloba2010-04-231-2/+6
| | |/ / /
* | | | | am bf73bbff: Merge "Some debugging help for issue #2594388" into froyoDianne Hackborn2010-04-232-1/+3
|\ \ \ \ \ | |/ / / /
| * | | | Some debugging help for issue #2594388Dianne Hackborn2010-04-222-1/+3
| |/ / /
* | | | am 69ec5c22: Remove the WebTextView if it is drawing when it shouldn\'t.Leon Scroggins2010-04-222-2/+19
|\ \ \ \ | |/ / /
| * | | Remove the WebTextView if it is drawing when it shouldn't.Leon Scroggins2010-04-222-2/+19
* | | | am a6ece18d: Merge "Added the subset of partial content support so that we ca...Grace Kloba2010-04-222-2/+36
|\ \ \ \ | |/ / /