summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 658b7a5a: am 12b6f6ea: am 55b7d124: merge from open-source masterThe Android Open Source Project2010-05-141-1/+1
|\
| * am 12b6f6ea: am 55b7d124: merge from open-source masterThe Android Open Source Project2010-05-141-1/+1
| |\
| | * am 55b7d124: merge from open-source masterThe Android Open Source Project2010-05-141-1/+1
| | |\
| | | * merge from open-source masterThe Android Open Source Project2010-05-141-1/+1
| | | |\
| | | | * Merge "SetLocaleByCarrier, only if its not an unknown carrier."Jean-Baptiste Queru2010-05-141-1/+1
| | | | |\
| | | | | * SetLocaleByCarrier, only if its not an unknown carrier.Jey2010-04-161-1/+1
* | | | | | am cb0bdf19: am ad8ce534: am 3d52305f: am 59cfe713: Merge "Doc change: adjust...Dirk Dougherty2010-05-141-17/+12
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am ad8ce534: am 3d52305f: am 59cfe713: Merge "Doc change: adjustments to the ...Dirk Dougherty2010-05-141-17/+12
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 3d52305f: am 59cfe713: Merge "Doc change: adjustments to the api changes d...Dirk Dougherty2010-05-141-17/+12
| | |\ \ \ \ | | | |/ / /
| | | * | | am 59cfe713: Merge "Doc change: adjustments to the api changes description" i...Dirk Dougherty2010-05-141-17/+12
| | | |\ \ \
| | | | * \ \ Merge "Doc change: adjustments to the api changes description" into froyoDirk Dougherty2010-05-141-17/+12
| | | | |\ \ \
| | | | | * | | Doc change: adjustments to the api changes descriptionDirk Dougherty2010-05-141-17/+12
* | | | | | | | am af4dbcd8: am 8072bdc6: am cae9cfee: am bba70cdb: Merge "Doc change: add no...Dirk Dougherty2010-05-141-2/+8
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 8072bdc6: am cae9cfee: am bba70cdb: Merge "Doc change: add note about futu...Dirk Dougherty2010-05-141-2/+8
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am cae9cfee: am bba70cdb: Merge "Doc change: add note about future instructio...Dirk Dougherty2010-05-141-2/+8
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | am bba70cdb: Merge "Doc change: add note about future instruction set support...Dirk Dougherty2010-05-141-2/+8
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | Merge "Doc change: add note about future instruction set support." into froyoDirk Dougherty2010-05-141-2/+8
| | | | |\ \ \ \
| | | | | * | | | Doc change: add note about future instruction set support.Dirk Dougherty2010-05-141-2/+8
| | | | | |/ / /
* | | | | | | | am e2fb67d4: am 41a450cd: am bf4cecd2: am 89969d4c: Merge "Doc change: docume...Dirk Dougherty2010-05-145-20/+811
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 41a450cd: am bf4cecd2: am 89969d4c: Merge "Doc change: documentation for l...Dirk Dougherty2010-05-145-20/+811
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am bf4cecd2: am 89969d4c: Merge "Doc change: documentation for library projec...Dirk Dougherty2010-05-145-20/+811
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | am 89969d4c: Merge "Doc change: documentation for library projects in sdk." i...Dirk Dougherty2010-05-145-20/+811
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | Merge "Doc change: documentation for library projects in sdk." into froyoDirk Dougherty2010-05-145-20/+811
| | | | |\ \ \ \
| | | | | * | | | Doc change: documentation for library projects in sdk.Dirk Dougherty2010-05-145-20/+811
* | | | | | | | | am ce3d8b31: am d95266c6: Merge "Detect and handle premature termination of a...James Dong2010-05-144-8/+19
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am d95266c6: Merge "Detect and handle premature termination of a recording se...James Dong2010-05-144-8/+19
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "Detect and handle premature termination of a recording session" into k...James Dong2010-05-144-8/+19
| | |\ \ \ \ \ \ \
| | | * | | | | | | Detect and handle premature termination of a recording sessionJames Dong2010-05-144-8/+19
* | | | | | | | | | am 9efc829e: am 4e544e81: Merge "Forgot to fix one -Wformat-security in my pr...Nick Kralevich2010-05-141-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 4e544e81: Merge "Forgot to fix one -Wformat-security in my previous change...Nick Kralevich2010-05-141-1/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge "Forgot to fix one -Wformat-security in my previous change. Fixed." in...Nick Kralevich2010-05-141-1/+1
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Forgot to fix one -Wformat-security in my previous change. Fixed.Nick Kralevich2010-05-141-1/+1
* | | | | | | | | | | am 9c192e44: am 29f5d9b6: Merge "Fix deadlock if the last reference of ICamer...Chih-Chung Chang2010-05-141-1/+6
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am 29f5d9b6: Merge "Fix deadlock if the last reference of ICameraClient is re...Chih-Chung Chang2010-05-141-1/+6
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge "Fix deadlock if the last reference of ICameraClient is removed in ICam...Chih-Chung Chang2010-05-141-1/+6
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Fix deadlock if the last reference of ICameraClient is removed inChih-Chung Chang2010-05-141-1/+6
* | | | | | | | | | | | am 33c06f91: am 6c034325: am 6d8e4fd8: am b83a283a: docs: add dev guide for b...Scott Main2010-05-144-16/+791
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am 6c034325: am 6d8e4fd8: am b83a283a: docs: add dev guide for backupScott Main2010-05-144-16/+791
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | am 6d8e4fd8: am b83a283a: docs: add dev guide for backupScott Main2010-05-144-16/+791
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | am b83a283a: docs: add dev guide for backupScott Main2010-05-144-16/+791
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / | | | | |/| | | | | | |
| | | | * | | | | | | | docs: add dev guide for backupScott Main2010-05-144-16/+791
| | | | | |_|_|_|/ / / | | | | |/| | | | | |
* | | | | | | | | | | am f4ca2ad0: am f55e3222: Merge "Fix issue 2622023 Clean up all hardcoded \'/...Ray Chen2010-05-141-7/+7
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am f55e3222: Merge "Fix issue 2622023 Clean up all hardcoded \'/sdcard\' in c...Ray Chen2010-05-141-7/+7
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge "Fix issue 2622023 Clean up all hardcoded '/sdcard' in camera related c...Ray Chen2010-05-141-7/+7
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / | | |/| | | | | | | |
| | | * | | | | | | | Fix issue 2622023 Clean up all hardcoded '/sdcard' in camera related codes.Ray Chen2010-05-141-7/+7
* | | | | | | | | | | Merge "More fragment stuff:"Dianne Hackborn2010-05-146-148/+429
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | More fragment stuff:Dianne Hackborn2010-05-146-148/+429
* | | | | | | | | | | | Merge "ActionBar - custom navigation views"Adam Powell2010-05-143-36/+90
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | ActionBar - custom navigation viewsAdam Powell2010-05-143-36/+90
| |/ / / / / / / / / / /
* | | | | | | | | | | | am 612058d1: am 9db798d0: Audio/video initial recording time synchronizationJames Dong2010-05-142-0/+38
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |