summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Fix some issues with RefBase debugging."Mathias Agopian2011-02-244-259/+426
|\
| * Fix some issues with RefBase debugging.Mathias Agopian2011-02-234-259/+426
* | Merge "Suppress the logging of URLs when in incognito mode."Andreas Huber2011-02-2410-15/+77
|\ \
| * | Suppress the logging of URLs when in incognito mode.Andreas Huber2011-02-2410-15/+77
* | | Merge "LayoutLib: move tests to their own project."Xavier Ducrohet2011-02-2412-66/+67
|\ \ \
| * | | LayoutLib: move tests to their own project.Xavier Ducrohet2011-02-2412-66/+67
* | | | Merge "Expand on the SurfaceTexture API docs."Jamie Gennis2011-02-241-1/+7
|\ \ \ \
| * | | | Expand on the SurfaceTexture API docs.Jamie Gennis2011-02-231-1/+7
* | | | | Merge "UsbManager: Remove redundant Intent extras from USB device and accesso...Mike Lockwood2011-02-245-206/+9
|\ \ \ \ \
| * | | | | UsbManager: Remove redundant Intent extras from USB device and accessory broa...Mike Lockwood2011-02-235-206/+9
| |/ / / /
* | | | | Merge "Import revised translations."Eric Fischer2011-02-2482-335/+415
|\ \ \ \ \
| * | | | | Import revised translations.Eric Fischer2011-02-2482-335/+415
* | | | | | Merge "Detect out of memory in extractAlpha"Eric Hassold2011-02-241-1/+7
|\ \ \ \ \ \
| * | | | | | Detect out of memory in extractAlphaEric Hassold2011-02-241-1/+7
* | | | | | | Merge "Remove commented cruft, TODOs, and dead code."Daniel Sandler2011-02-241-162/+7
|\ \ \ \ \ \ \
| * | | | | | | Remove commented cruft, TODOs, and dead code.Daniel Sandler2011-02-231-162/+7
* | | | | | | | Merge "Binder linkage no longer depends on JNI objrefs as persistent tokens"Christopher Tate2011-02-242-52/+146
|\ \ \ \ \ \ \ \
| * | | | | | | | Binder linkage no longer depends on JNI objrefs as persistent tokensChristopher Tate2011-02-242-52/+146
* | | | | | | | | Merge "Bug 3438258 Add SurfaceTexture as MediaPlayer sink"Glenn Kasten2011-02-2430-65/+342
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Bug 3438258 Add SurfaceTexture as MediaPlayer sinkGlenn Kasten2011-02-2330-65/+342
* | | | | | | | | | Merge "center long press to account for sloppy nodes"Cary Clark2011-02-241-0/+11
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | center long press to account for sloppy nodesCary Clark2011-02-241-0/+11
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | am 86409c8c: (-s ours) am 1c38872f: Merge "Import revised translations. DO N...Eric Fischer2011-02-240-0/+0
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ am 1c38872f: Merge "Import revised translations. DO NOT MERGE" into honeycombEric Fischer2011-02-2442-325/+249
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge "Import revised translations. DO NOT MERGE" into honeycombEric Fischer2011-02-2442-325/+249
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Import revised translations. DO NOT MERGEEric Fischer2011-02-2442-325/+249
* | | | | | | | | | | | | Merge "Stop the blinking caret when moving to another field."Leon Scroggins2011-02-242-7/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Stop the blinking caret when moving to another field.Leon Scroggins2011-02-242-7/+9
* | | | | | | | | | | | | | Merge "Fix 3272590: Long-press on home & menu should be same as click"Patrick Dubroy2011-02-243-36/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix 3272590: Long-press on home & menu should be same as clickPatrick Dubroy2011-02-243-36/+21
| | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | am ee38808d: am 0dc8618d: Do not start RILReceiver if wifi-only.Wink Saville2011-02-241-8/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | am 0dc8618d: Do not start RILReceiver if wifi-only.Wink Saville2011-02-241-8/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Do not start RILReceiver if wifi-only.Wink Saville2011-02-231-8/+18
* | | | | | | | | | | | | | am 3905bc6c: (-s ours) am be2ed6d6: resolved conflicts for merge of c96b6690 ...repo sync2011-02-240-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | am be2ed6d6: resolved conflicts for merge of c96b6690 to gingerbread-plus-aosprepo sync2011-02-240-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of c96b6690 to gingerbread-plus-aosprepo sync2011-02-240-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge "DO NOT MERGE - Increasing timeout to 60 sec This was already done in H...Alon Albert2011-02-241-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | DO NOT MERGE - Increasing timeout to 60 secAlon Albert2011-02-231-2/+2
* | | | | | | | | | | | | | | | | Merge "Pre-calculate view scale and text wrap scale for webkit."Shimeng (Simon) Wang2011-02-242-10/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Pre-calculate view scale and text wrap scale for webkit.Shimeng (Simon) Wang2011-02-242-10/+40
* | | | | | | | | | | | | | | | | | Merge "Cursors correctly displayed with legacy theme."Gilles Debunne2011-02-241-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Cursors correctly displayed with legacy theme.Gilles Debunne2011-02-231-2/+5
| |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge "Text handles movement improvements."Gilles Debunne2011-02-241-35/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Text handles movement improvements.Gilles Debunne2011-02-231-35/+30
* | | | | | | | | | | | | | | | | | Merge "Fix MP3Extractor"James Dong2011-02-241-5/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Fix MP3ExtractorJames Dong2011-02-241-5/+13
| | |_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge "Bug 3362814 Fix SMP race in access to mRequestExit"Glenn Kasten2011-02-242-5/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Bug 3362814 Fix SMP race in access to mRequestExitGlenn Kasten2011-02-232-5/+25
| | |_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge "Don't crash when parsing DRM MIME types"Glenn Kasten2011-02-241-5/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Don't crash when parsing DRM MIME typesGlenn Kasten2011-02-181-5/+12