summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add support for multiple html directories to droiddoc.Bill Napier2010-08-243-13/+18
* Restore OTA for crespo. [DO NOT MERGE]Ying Wang2010-08-211-3/+0
* Better way to disable OTAs for crespo - DO NOT MERGEJean-Baptiste Queru2010-08-201-1/+1
* Disable OTA for crespo [DO NOT MERGE]Ying Wang2010-08-201-0/+3
* am 817a8ac9: (-s ours) bump version from 2.2 to 2.2.1 for next froyo releaseandroid-build SharedAccount2010-08-180-0/+0
|\
| * bump version from 2.2 to 2.2.1 for next froyo releaseandroid-build SharedAccount2010-08-171-1/+1
* | Make ProGuard keep necessary members for serializable classesHung-ying Tyan2010-08-111-0/+13
* | Merge "Add voip(SIP related codes) into framework." into gingerbreadChung-yih Wang2010-08-051-0/+1
|\ \
| * | Add voip(SIP related codes) into framework.Chung-yih Wang2010-08-051-0/+1
* | | am 4f2436dc: update carousel icon for nexus one dev phoneScott Main2010-08-051-0/+0
|\ \ \ | | |/ | |/|
| * | update carousel icon for nexus one dev phoneScott Main2010-08-051-0/+0
* | | am 7589398c: Merge "Doc change: Add nexus one to dev phones image." into froyoScott Main2010-08-051-0/+0
|\ \ \ | |/ /
| * | Merge "Doc change: Add nexus one to dev phones image." into froyoScott Main2010-08-051-0/+0
| |\ \
| | * | Doc change: Add nexus one to dev phones image.Dirk Dougherty2010-07-231-0/+0
* | | | Tracking merge of dalvik-dev to gingerbreadBrian Carlstrom2010-08-043-62/+25
| |_|/ |/| |
* | | am 55edb20e: Merge "Dist apkcerts.txt for unbundled builds" into froyoYing Wang2010-07-291-0/+7
|\ \ \ | |/ /
| * | Merge "Dist apkcerts.txt for unbundled builds" into froyoYing Wang2010-07-291-0/+7
| |\ \
| | * | Dist apkcerts.txt for unbundled buildsYing Wang2010-07-231-0/+7
| | |/
* | | am 3a0576a4: merge from open-source froyoThe Android Open Source Project2010-07-280-0/+0
|\ \ \ | |/ /
| * | merge from open-source froyoThe Android Open Source Project2010-07-280-0/+0
| |\ \
| | * \ reconcile forked froyosThe Android Open Source Project2010-07-284-5/+14
| | |\ \
* | | \ \ am af44485f: merge from open-source froyoThe Android Open Source Project2010-07-261-53/+2
|\ \ \ \ \ | |/ / / /
| * | | | merge from open-source froyoThe Android Open Source Project2010-07-261-53/+2
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| |
| | * | Include Test Case List from CTS ProjectBrian Muramatsu2010-07-221-53/+2
* | | | resolved conflicts for merge of 121a7873 to gingerbreadEvan Charlton2010-07-232-1/+6
|\ \ \ \ | |/ / /
| * | | Packages can specify where to find AndroidManifest.xmlEvan Charlton2010-07-232-1/+6
* | | | am bce4b75f: Add JNI_H_INCLUDE as default header search pathYing Wang2010-07-221-0/+4
|\ \ \ \ | |/ / /
| * | | Add JNI_H_INCLUDE as default header search pathYing Wang2010-07-221-0/+4
| | |/ | |/|
* | | am d5c217ac: Merge "add phony target "all_modules" and use it as make goal fo...Ying Wang2010-07-222-4/+8
|\ \ \ | |/ /
| * | Merge "add phony target "all_modules" and use it as make goal for "mm"/"mmm""...Ying Wang2010-07-222-4/+8
| |\ \
| | * | add phony target "all_modules" and use it as make goal for "mm"/"mmm"Ying Wang2010-07-202-4/+8
* | | | am 75b28573: Fix sim build for unbundling native codeYing Wang2010-07-221-0/+4
|\ \ \ \ | |/ / /
| * | | Fix sim build for unbundling native codeYing Wang2010-07-161-0/+4
| |/ /
* | | Do a full clean build because of the installclean improvement stepsJoe Onorato2010-07-151-1/+1
* | | am 9269a711: docs: ensure code-ified links in qv are the proper colorScott Main2010-07-151-1/+2
|\ \ \ | |/ /
| * | docs: ensure code-ified links in qv are the proper colorScott Main2010-07-151-1/+2
| |/
* | Merge "Instrumentation links against the jar file for its app, so use that at...Joe Onorato2010-07-151-4/+1
|\ \
| * | Instrumentation links against the jar file for its app, so use that at the de...Joe Onorato2010-07-141-4/+1
* | | Merge "Fix event-log-tags so we don't rebuild framework.jar because of an ins...Joe Onorato2010-07-153-12/+48
|\ \ \ | |/ /
| * | Fix event-log-tags so we don't rebuild framework.jar because of an installclean.Joe Onorato2010-07-143-12/+48
* | | Merge "The ICU data is no longer compiled directly into the shared library." ...Joe Onorato2010-07-151-2/+0
|\ \ \ | |/ /
| * | The ICU data is no longer compiled directly into the shared library.Joe Onorato2010-07-131-2/+0
* | | Merge "add an entry for the new libgui" into gingerbreadMathias Agopian2010-07-141-3/+7
|\ \ \
| * | | add an entry for the new libguiMathias Agopian2010-07-131-3/+7
* | | | am a0cb4666: Merge "merge from open-source froyo" into froyoJean-Baptiste Queru2010-07-141-0/+2
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Merge "merge from open-source froyo" into froyoJean-Baptiste Queru2010-07-141-0/+2
| |\ \
| | * \ merge from open-source froyoThe Android Open Source Project2010-07-131-0/+2
| | |\ \
| | | * | Build Accessibility Tests and APKBrian Muramatsu2010-07-081-0/+2
* | | | | resolved conflicts for merge of a6bed2f7 to gingerbreadYing Wang2010-07-131-1/+4
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Add phony target dist_libraries" into froyoYing Wang2010-07-131-1/+4
| |\ \ \ \
generated by cgit v1.1 at 2024-08-08 06:54:05 +0000