summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* API Extension: Support for optionally specifying a map of extra request heade...Andreas Huber2010-01-281-1/+1
* Merge "First pass at the url rendering service."Patrick Scott2010-01-280-0/+0
|\
* \ Merge "Add streaming method profiling support."Andy McFadden2010-01-280-0/+0
|\ \
* \ \ Merge "Remove destroy asec command when mounting secure container"San Mehat2010-01-280-0/+0
|\ \ \ | |_|/ |/| |
* | | Merge "timestamp field in ApplicationErrorReport was not getting intitialized...Jacek Surazski2010-01-280-0/+0
|\ \ \
* \ \ \ Merge "Added OverScroller and overscroll effects for ScrollView and Horizonta...Romain Guy2010-01-270-0/+0
|\ \ \ \ | |_|/ / |/| | |
* | | | am 6f3e1e27: am 9a400fa4: Merge "initialize sync adapters that get installed ...Fred Quintana2010-01-270-0/+0
|\ \ \ \
| * \ \ \ am 9a400fa4: Merge "initialize sync adapters that get installed while the sys...Fred Quintana2010-01-210-0/+0
| |\ \ \ \
| | * \ \ \ Merge "initialize sync adapters that get installed while the system is runnin...Fred Quintana2010-01-210-0/+0
| | |\ \ \ \
* | | \ \ \ \ am 3c2d3667: am 036e2108: Fix NPE when importing from USIM.jsh2010-01-270-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 036e2108: Fix NPE when importing from USIM.jsh2010-01-210-0/+0
| |\ \ \ \ \ \ | | |/ / / / /
* | | | | | | am 47f1d4d5: am b1780474: Merge "Instead of caputre the memory footprint befo...Yu Shan Emily Lau2010-01-270-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am b1780474: Merge "Instead of caputre the memory footprint before and after ...Yu Shan Emily Lau2010-01-210-0/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Instead of caputre the memory footprint before and after the test. We ...Yu Shan Emily Lau2010-01-210-0/+0
| | |\ \ \ \ \
* | | \ \ \ \ \ am ad0e5363: am 50adb167: Pull in "emergency calls only" translations.Eric Fischer2010-01-270-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 50adb167: Pull in "emergency calls only" translations.Eric Fischer2010-01-210-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / /
* | | | | | | | am 97fdd0ab: am 7f70998d: Merge "Add Emergency Calls Only String." into eclairJohn Wang2010-01-270-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 7f70998d: Merge "Add Emergency Calls Only String." into eclairJohn Wang2010-01-210-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "Add Emergency Calls Only String." into eclairJohn Wang2010-01-210-0/+0
| | |\ \ \ \ \ \
* | | \ \ \ \ \ \ am 29bc7270: am 495bae67: Merge "fix bug 2264186: clean up the outstanding as...Wei Huang2010-01-270-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 495bae67: Merge "fix bug 2264186: clean up the outstanding async queries i...Wei Huang2010-01-210-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "fix bug 2264186: clean up the outstanding async queries in ContactHead...Wei Huang2010-01-210-0/+0
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
* | | | | | | | | Merge "Fix http streaming for shoutcast servers that do not support http rang...Andreas Huber2010-01-270-0/+0
|\ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ resolved conflicts for merge of 176a88ff to masterRomain Guy2010-01-270-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | merge from open-source masterThe Android Open Source Project2010-01-210-0/+0
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge "New View.dispatchDisplayHint() API. Bug #2399147"Romain Guy2010-01-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ am 6efe03b1: am 6f9e2c64: Merge "Find layout classes in all "layout-*" dirs."...Ying Wang2010-01-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| / / / / / / / / / / | |/ / / / / / / / / /
| * | | | | | | | | | am 6f9e2c64: Merge "Find layout classes in all "layout-*" dirs." into eclairYing Wang2010-01-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge "Find layout classes in all "layout-*" dirs." into eclairYing Wang2010-01-210-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / | | |/| | | | | | | |
* | | | | | | | | | | Merge "Revert I3fdda2588a7c612d7c9cfb4f25d9aedd1d609162 which open two functi...Owen Lin2010-01-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ Merge "Add asec permission to DefaultContainerService"Suchi Amalapurapu2010-01-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ Merge "Phase 2 of test file cleanup: relocating test files from FrameworkTest...Neal Nguyen2010-01-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge "Report tombstone (native crash) data to the dropbox."Dan Egnor2010-01-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge "Fix some minor bugs with GL state setup that were exposed by Droids dr...Jason Sams2010-01-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge "Fix issue 2285561: New AudioFlinger and audio driver API needed for A/...Eric Laurent2010-01-2710-9/+62
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Fix issue 2285561: New AudioFlinger and audio driver API needed for A/V syncEric Laurent2010-01-2610-9/+62
* | | | | | | | | | | | | Merge "Moving framework core tests closer to their source files."Neal Nguyen2010-01-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Add request header support for the Browser/WebView. QSB can use this i...Grace Kloba2010-01-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge "Attempt to fix the build ... again."Andreas Huber2010-01-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge "Remove about-to-be-renamed class from preload list."Elliott Hughes2010-01-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge "Do not hold onto the master lock while reading data from the datasourc...Andreas Huber2010-01-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Fix ExtendedProperties EntityIterator."Ken Shirriff2010-01-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge "Move Search dialog out of system process into current activity."Amith Yamasani2010-01-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / |/| | | | / / / / / / / / / / | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge "dont use sqlite_stmt_journals dir"Vasu Nori2010-01-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge "AppsOnSd feature - Add default container"Suchi Amalapurapu2010-01-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Add the new golden thumbnail image as the PV and stagefright implement...Yu Shan Emily Lau2010-01-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | / / / / / / / / / | | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge "update javadoc for Settings.Secure.ANDROID_ID"Doug Zongker2010-01-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | / / / / / / / / / / | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge "b/2383073 Add fine-grained status codes for failed downloads."Evan Millar2010-01-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Better support for HTTP streaming media content, fixes to the way HTTP...Andreas Huber2010-01-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Add support for setting camera display orientation."Chih-Chung Chang2010-01-274-38/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | |