summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* merge from open-source masterThe Android Open Source Project2010-05-192-0/+19
|\
| * Merge "Add and document .nomedia constant for MediaStore (Issue 6365)"Romain Guy2010-05-192-0/+19
| |\
| | * Add and document .nomedia constant for MediaStore (Issue 6365)Karl Ostmo2010-05-172-0/+19
* | | merge from open-source masterThe Android Open Source Project2010-05-191-0/+4
|\ \ \ | |/ /
| * | Merge "Text disappears when selecting text in text editor."Romain Guy2010-05-191-0/+4
| |\ \
| | * | Text disappears when selecting text in text editor.Viktor Yakovel2010-04-211-0/+4
* | | | merge from open-source masterThe Android Open Source Project2010-05-194-11/+5
|\ \ \ \ | |/ / /
| * | | Merge "Removed Calls to deprecated APIs"Romain Guy2010-05-194-12/+5
| |\ \ \
| | * | | Removed Calls to deprecated APIsChristian Mehlmauer2010-05-174-12/+5
| | | |/ | | |/|
* | | | merge from open-source masterThe Android Open Source Project2010-05-190-0/+0
|\ \ \ \ | |/ / /
| * | | Merge "Improved error handling when font loading fails."Romain Guy2010-05-181-0/+3
| |\ \ \
| | * | | Improved error handling when font loading fails.Peter Eliasson2010-04-261-0/+3
* | | | | am 4a0823e5: Merge "Uncomment a test that was marked as STOPSHIP Add MediumTe...Suchi Amalapurapu2010-05-181-3/+2
|\ \ \ \ \
| * \ \ \ \ Merge "Uncomment a test that was marked as STOPSHIP Add MediumTest tag" into ...Suchi Amalapurapu2010-05-181-3/+2
| |\ \ \ \ \
| | * | | | | Uncomment a test that was marked as STOPSHIPSuchi Amalapurapu2010-05-181-3/+2
* | | | | | | am ef95aceb: Merge "Removing STOPSHIP logs." into froyoJaikumar Ganesh2010-05-181-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Removing STOPSHIP logs." into froyoJaikumar Ganesh2010-05-181-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Removing STOPSHIP logs.Jaikumar Ganesh2010-05-181-1/+1
* | | | | | | am 9a212adc: Fix 2641875 Initialize the cache path only if the container exis...Suchi Amalapurapu2010-05-182-3/+6
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Fix 2641875Suchi Amalapurapu2010-05-182-3/+6
* | | | | | | merge from open-source masterThe Android Open Source Project2010-05-1820-119/+115
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | fix buildJean-Baptiste Queru2010-05-181-2/+3
| * | | | | | Merge "Fix some typos and other cosmetic cleanups in telephony framework."Jean-Baptiste Queru2010-05-1820-121/+115
| |\ \ \ \ \ \
| | * | | | | | Fix some typos and other cosmetic cleanups in telephony framework.Jake Hamby2010-05-1320-121/+115
* | | | | | | | merge from open-source masterThe Android Open Source Project2010-05-183-38/+49
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Fix updating and deleting FDN entries with an empty alpha identifier.Jake Hamby2010-05-183-37/+48
| * | | | | | | Merge "Abort FDN delete when number is empty (instead of name)"Jean-Baptiste Queru2010-05-181-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Abort FDN delete when number is empty (instead of name)Mikael Danielsson2010-05-101-1/+1
* | | | | | | | | merge from open-source masterThe Android Open Source Project2010-05-182-5/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Removed Calls to deprecated APIs and unused ImportsChristian Mehlmauer2010-05-174-11/+4
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | am 5f1d1002: Merge "docs: fix markup error" into froyoScott Main2010-05-181-1/+2
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge "docs: fix markup error" into froyoScott Main2010-05-181-1/+2
| |\ \ \ \ \ \ \
| | * | | | | | | docs: fix markup errorScott Main2010-05-181-1/+2
* | | | | | | | | am e64256d6: Merge "docs: revise webview description and add info for targeti...Scott Main2010-05-171-20/+103
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "docs: revise webview description and add info for targeting screen den...Scott Main2010-05-171-20/+103
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | docs: revise webview description and add info for targeting screen densitiesScott Main2010-05-171-20/+103
* | | | | | | | | am 6750bb7f: Doc change: add link to source.android.comDirk Dougherty2010-05-171-1/+12
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Doc change: add link to source.android.comDirk Dougherty2010-05-171-1/+12
* | | | | | | | | am 6bb6348f: Doc change: cherry pick from eclair ->docs: add dashboard for sc...Dirk Dougherty2010-05-173-30/+104
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Doc change: cherry pick from eclair ->docs: add dashboard for screensDirk Dougherty2010-05-173-30/+104
| |/ / / / / / /
* | | | | | | | am eb9cbb8f: Resurrect flashlight support in obsolete IHardwareService Binder...Mike Lockwood2010-05-173-1/+77
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Resurrect flashlight support in obsolete IHardwareService Binder API.Mike Lockwood2010-05-173-1/+77
* | | | | | | | am cfa2de30: Import revised translationsKenny Root2010-05-1720-52/+52
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Import revised translationsKenny Root2010-05-1720-52/+52
* | | | | | | | merge from open-source masterThe Android Open Source Project2010-05-171-2/+20
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge "Updated RGB LED test cases"Jean-Baptiste Queru2010-05-171-2/+20
| |\ \ \ \ \ \ \
| | * | | | | | | Updated RGB LED test casesMattias Östergren2010-03-051-2/+20
* | | | | | | | | merge from open-source masterThe Android Open Source Project2010-05-173-1/+21
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "Fixing indeterminate progress bar animation state."Romain Guy2010-05-151-0/+16
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fixing indeterminate progress bar animation state.David Sobreira Marques2010-05-151-0/+16