Log - 5f0df7a95bb6b7bbbd6fb0062bef915873f9e5a1 - SHIFTPHONES/android_build

5f0df7a Manual merge by Jean-Baptiste Queru · 15 years ago
cdc1d6f am cb92616f: Merge "Add support for multiple html directories to droiddoc." into gingerbread by Rohit Mungee · 15 years ago
cb92616 Merge "Add support for multiple html directories to droiddoc." into gingerbread by Rohit Mungee · 15 years ago
0e143c0 Add support for multiple html directories to droiddoc. by Bill Napier · 15 years ago
2213aab Add new variable TARGET_SHELL := ash (default; or mksh) by Thorsten Glaser · 15 years ago
567ec8e am ee4bad51: Disable CheckSize on ext partitions to fix build [DO NOT MERGE] by Ying Wang · 15 years ago
ee4bad5 Disable CheckSize on ext partitions to fix build [DO NOT MERGE] by Ying Wang · 15 years ago
b4df348 am 34acfcf6: merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward by Jean-Baptiste Queru · 15 years ago
34acfcf merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward by Jean-Baptiste Queru · 15 years ago
2eed660 am ffff0028: Pass pagesize to makebootimage. by Ying Wang · 15 years ago
ffff002 Pass pagesize to makebootimage. by Ying Wang · 15 years ago
d3b973d am 065521be: Backport ext4 support from master [DO NOT MERGE] by Ying Wang · 15 years ago
065521b Backport ext4 support from master [DO NOT MERGE] by Ying Wang · 15 years ago
d4ee2de am ad3cf5f8: Restore OTA for crespo. [DO NOT MERGE] by Ying Wang · 15 years ago
ad3cf5f Restore OTA for crespo. [DO NOT MERGE] by Ying Wang · 15 years ago
ed91928 am 60d1ee3e: Better way to disable OTAs for crespo - DO NOT MERGE by Jean-Baptiste Queru · 15 years ago
60d1ee3 Better way to disable OTAs for crespo - DO NOT MERGE by Jean-Baptiste Queru · 15 years ago
13a019f am 7daa9132: Disable OTA for crespo [DO NOT MERGE] by Ying Wang · 15 years ago
7daa913 Disable OTA for crespo [DO NOT MERGE] by Ying Wang · 15 years ago
477ddfc FRG51 by android-build SharedAccount · 15 years ago
57b1c1c FRG49 by android-build SharedAccount · 15 years ago
ba509c8 am c434bbbb: am 817a8ac9: (-s ours) bump version from 2.2 to 2.2.1 for next froyo release by android-build SharedAccount · 15 years ago
c434bbb am 817a8ac9: (-s ours) bump version from 2.2 to 2.2.1 for next froyo release by android-build SharedAccount · 15 years ago
5fad3f5 bump version from 2.2 to 2.2.1 for next froyo release by android-build SharedAccount · 15 years ago
817a8ac bump version from 2.2 to 2.2.1 for next froyo release by android-build SharedAccount · 15 years ago
ddf08ca am ddeb150d: Add easymock for list of Windows SDK targets. by Raphael Moll · 15 years ago
ddeb150 Add easymock for list of Windows SDK targets. by Raphael Moll · 15 years ago
4a6e7d7 am 43d406e5: Merge "add drm/ directory to include it as part of frameworks" by Jean-Baptiste Queru · 15 years ago
43d406e Merge "add drm/ directory to include it as part of frameworks" by Jean-Baptiste Queru · 15 years ago
059815f FRG22D by android-build SharedAccount · 15 years ago
93a2bf5 FRG22C by android-build SharedAccount · 15 years ago
1c117bd FRG22B by android-build SharedAccount · 15 years ago
d81e9f8 am ddefdef5: Make ProGuard keep necessary members for serializable classes by Hung-ying Tyan · 15 years ago
ddefdef Make ProGuard keep necessary members for serializable classes by Hung-ying Tyan · 15 years ago
9b7ebf5 am 1a2649f0: Merge "Add voip(SIP related codes) into framework." into gingerbread by Chung-yih Wang · 15 years ago
1a2649f Merge "Add voip(SIP related codes) into framework." into gingerbread by Chung-yih Wang · 15 years ago
240782f am 6eea9363: am 4f2436dc: update carousel icon for nexus one dev phone by Scott Main · 15 years ago
b7256fd am be4696e0: am 7589398c: Merge "Doc change: Add nexus one to dev phones image." into froyo by Scott Main · 15 years ago
6eea936 am 4f2436dc: update carousel icon for nexus one dev phone by Scott Main · 15 years ago
be4696e am 7589398c: Merge "Doc change: Add nexus one to dev phones image." into froyo by Scott Main · 15 years ago
f9be433 am 7dc35a3b: Tracking merge of dalvik-dev to gingerbread by Brian Carlstrom · 15 years ago
4f2436d update carousel icon for nexus one dev phone by Scott Main · 15 years ago
7589398 Merge "Doc change: Add nexus one to dev phones image." into froyo by Scott Main · 15 years ago
7dc35a3 Tracking merge of dalvik-dev to gingerbread by Brian Carlstrom · 15 years ago
ab8ed58 Add voip(SIP related codes) into framework. by Chung-yih Wang · 15 years ago
404cd14 33b special by android-build SharedAccount · 15 years ago
69e381b FRG33 by android-build SharedAccount · 15 years ago
33c11ac am e1f37ba0: am 55edb20e: Merge "Dist apkcerts.txt for unbundled builds" into froyo by Ying Wang · 15 years ago
e1f37ba am 55edb20e: Merge "Dist apkcerts.txt for unbundled builds" into froyo by Ying Wang · 15 years ago
55edb20 Merge "Dist apkcerts.txt for unbundled builds" into froyo by Ying Wang · 15 years ago
4527075 am e743c53b: Package ddmlib-prebuilt with CTS. by Xavier Ducrohet · 15 years ago
636e6de am 609fef71: am 3a0576a4: merge from open-source froyo by The Android Open Source Project · 15 years ago
609fef7 am 3a0576a4: merge from open-source froyo by The Android Open Source Project · 15 years ago
3a0576a merge from open-source froyo by The Android Open Source Project · 15 years ago
e743c53 Package ddmlib-prebuilt with CTS. by Xavier Ducrohet · 15 years ago
dbaff11 reconcile forked froyos by The Android Open Source Project · 15 years ago
2bdf265 add drm/ directory to include it as part of frameworks by aimitakeshi · 15 years ago
4e8e998 am 989fade3: am af44485f: merge from open-source froyo by The Android Open Source Project · 15 years ago
989fade am af44485f: merge from open-source froyo by The Android Open Source Project · 15 years ago
af44485 merge from open-source froyo by The Android Open Source Project · 15 years ago
606540b resolved conflicts for merge of f2bfa76c to gingerbread-plus-aosp by Evan Charlton · 15 years ago
efb2168 Dist apkcerts.txt for unbundled builds by Ying Wang · 15 years ago
35e642f Doc change: Add nexus one to dev phones image. by Dirk Dougherty · 15 years ago
f2bfa76 resolved conflicts for merge of 121a7873 to gingerbread by Evan Charlton · 15 years ago
44d6285 am 8339ba91: Merge "Replaced AlarmClock with DeskClock" by Jean-Baptiste Queru · 15 years ago
8339ba9 Merge "Replaced AlarmClock with DeskClock" by Jean-Baptiste Queru · 15 years ago
5022d63 Replaced AlarmClock with DeskClock by Christian Mehlmauer · 15 years ago
121a787 Packages can specify where to find AndroidManifest.xml by Evan Charlton · 15 years ago
0b991a1 FRG22 by android-build SharedAccount · 15 years ago
3986fea am ef5bf469: am bce4b75f: Add JNI_H_INCLUDE as default header search path by Ying Wang · 15 years ago
ef5bf46 am bce4b75f: Add JNI_H_INCLUDE as default header search path by Ying Wang · 15 years ago
bce4b75 Add JNI_H_INCLUDE as default header search path by Ying Wang · 15 years ago
fa3d88f Include Test Case List from CTS Project by Brian Muramatsu · 15 years ago
85581a1 merge from open-source master by The Android Open Source Project · 15 years ago
b96e8a8 am d9dea715: am d5c217ac: Merge "add phony target "all_modules" and use it as make goal for "mm"/"mmm"" into froyo by Ying Wang · 15 years ago
163ce0f am ebf93bb5: am 75b28573: Fix sim build for unbundling native code by Ying Wang · 15 years ago
d9dea71 am d5c217ac: Merge "add phony target "all_modules" and use it as make goal for "mm"/"mmm"" into froyo by Ying Wang · 15 years ago
ebf93bb am 75b28573: Fix sim build for unbundling native code by Ying Wang · 15 years ago
d5c217a Merge "add phony target "all_modules" and use it as make goal for "mm"/"mmm"" into froyo by Ying Wang · 15 years ago
0188414 add phony target "all_modules" and use it as make goal for "mm"/"mmm" by Ying Wang · 15 years ago
7adbf97 Allow explicit warnings for projects by Jeffrey Chyan · 15 years ago
fa2d8ac merge from open-source master by The Android Open Source Project · 15 years ago
75b2857 Fix sim build for unbundling native code by Ying Wang · 15 years ago
c8ae417 am b1c272a6: Do a full clean build because of the installclean improvement steps by Joe Onorato · 15 years ago
b1c272a Do a full clean build because of the installclean improvement steps by Joe Onorato · 15 years ago
21bd43a am 81f42236: am 9269a711: docs: ensure code-ified links in qv are the proper color by Scott Main · 15 years ago
81f4223 am 9269a711: docs: ensure code-ified links in qv are the proper color by Scott Main · 15 years ago
0958d77 FRG15B by android-build SharedAccount · 15 years ago
6c2df3e Add full_x86 product. by Jean-Baptiste Queru · 15 years ago
ed37e36 FRG15 by android-build SharedAccount · 15 years ago
9269a71 docs: ensure code-ified links in qv are the proper color by Scott Main · 15 years ago
90ef224 am e2c62252: Merge "Instrumentation links against the jar file for its app, so use that at the dependency." into gingerbread by Joe Onorato · 15 years ago
84843e6 am d7324cc3: Merge "Fix event-log-tags so we don\'t rebuild framework.jar because of an installclean." into gingerbread by Joe Onorato · 15 years ago
a3b31fb am 2198ff81: Merge "The ICU data is no longer compiled directly into the shared library." into gingerbread by Joe Onorato · 15 years ago
e2c6225 Merge "Instrumentation links against the jar file for its app, so use that at the dependency." into gingerbread by Joe Onorato · 15 years ago
d7324cc Merge "Fix event-log-tags so we don't rebuild framework.jar because of an installclean." into gingerbread by Joe Onorato · 15 years ago
2198ff8 Merge "The ICU data is no longer compiled directly into the shared library." into gingerbread by Joe Onorato · 15 years ago
14d9515 Instrumentation links against the jar file for its app, so use that at the dependency. by Joe Onorato · 15 years ago
e80545f am 9967e9db: Merge "add an entry for the new libgui" into gingerbread by Mathias Agopian · 15 years ago
9967e9d Merge "add an entry for the new libgui" into gingerbread by Mathias Agopian · 15 years ago