summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-12-04Merge "Simplify makefile."android-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-cts-4.4_r4android-cts-4.4_r1android-4.4w_r1android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9android-4.4_r0.8android-4.4_r0.7android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1android-4.3_r3.1android-4.3_r3android-4.3_r2.3android-4.3_r2.2android-4.3_r2.1android-4.3_r2android-4.3_r1.1android-4.3_r1android-4.3_r0.9.1android-4.3_r0.9android-4.3.1_r1tools_r22.2tools_r22kitkat-wearkitkat-releasekitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-devkitkat-cts-releasekitkat-cts-devjb-mr2.0.0-releasejb-mr2.0-releasejb-mr2-releasejb-mr2-devjb-mr1.1-dev-plus-aospjb-mr1-dev-plus-aospElliott Hughes
2012-12-04Simplify makefile.Elliott Hughes
Change-Id: I7c9c3cd77be6a2f334d52474d6554057ba36e716
2012-05-15Remove obsolete ThirdPartyProject.prop file.android-sdk-support_r11android-cts-4.2_r2android-cts-4.2_r1android-4.2_r1android-4.2.2_r1.2android-4.2.2_r1.1android-4.2.2_r1android-4.2.1_r1.2android-4.2.1_r1.1android-4.2.1_r1jb-mr1.1-releasejb-mr1.1-devjb-mr1-releasejb-mr1-devElliott Hughes
Change-Id: I275f364198ed5ac781e821e69d4dcb56504dc4aa
2011-05-20Reconcile with honeycomb-releaseandroid-sdk-adt_r20android-sdk-adt_r16.0.1android-sdk-4.0.3_r1android-sdk-4.0.3-tools_r1android-cts-verifier-4.0_r1android-cts-verifier-4.0.3_r1android-cts-4.1_r4android-cts-4.1_r2android-cts-4.1_r1android-cts-4.0_r1android-cts-4.0.3_r2android-cts-4.0.3_r1android-4.1.2_r2.1android-4.1.2_r2android-4.1.2_r1android-4.1.1_r6.1android-4.1.1_r6android-4.1.1_r5android-4.1.1_r4android-4.1.1_r3android-4.1.1_r2android-4.1.1_r1.1android-4.1.1_r1android-4.0.4_r2.1android-4.0.4_r2android-4.0.4_r1.2android-4.0.4_r1.1android-4.0.4_r1android-4.0.3_r1.1android-4.0.3_r1android-4.0.2_r1android-4.0.1_r1.2android-4.0.1_r1.1android-4.0.1_r1tools_r21tools_r20jb-releasejb-mr0-releasejb-devics-plus-aospics-mr1-releaseics-mr1ics-mr0-releaseics-mr0ics-factoryrom-2-releaseThe Android Open Source Project
Change-Id: I2716b91f5b133ffd4b908227315129a5041fb3c6
2011-04-01Merge remote branch 'goog/dalvik-dev' into dalvik-dev-to-masterBrian Carlstrom
2011-01-31am 9fb03df8: Remove dependency to libcore.Anatol Pomazau
* commit '9fb03df8f04136e01e1c54ce55b5f14f19e6af98': Remove dependency to libcore.
2011-01-31Remove dependency to libcore.Anatol Pomazau
Having less dependencies between heavy libraries makes the build process faster. Change-Id: I93d3cbd02510f52aa7d8c0f5c0bf1fc85b381d9a
2011-01-20am c5cd1f43: Include XML resource properties files in the jar.Jesse Wilson
* commit 'c5cd1f43011fff85944b0558aaf1718f0eb9ab11': Include XML resource properties files in the jar.
2011-01-20Include XML resource properties files in the jar.Jesse Wilson
The lack of these files was breaking several DOM tests in our continuous build! Change-Id: I3f31bc2b173af7b138838b8d5859d4b496302a97
2011-01-16am 0be4d7ce: Move apache-xml to external. (project 1 of 4)Jesse Wilson
* commit '0be4d7ce48d3851f2e4110f8f0b0d3129f5327fb': Move apache-xml to external. (project 1 of 4)
2011-01-14Move apache-xml to external. (project 1 of 4) (dalvik-dev)Jesse Wilson
Change-Id: If39b2392a501d3d9c7862e69301c2a36d7628ff5 http://b/3351604
2011-01-14Move apache-xml to external. (project 1 of 4)Jesse Wilson
Change-Id: I4dd96e48227a12980b641ec786f689935e6739f2 http://b/3351604
2011-01-13merge in honeycomb-release history after reset to honeycombThe Android Automerger
2011-01-12am 3dad2dc5: am f74c8a0e: resolved conflicts for merge of 4f7abf2a to ↵repo sync
honeycomb-plus-aosp * commit '3dad2dc5dc3b134eb05e61f66754f4d796d07a79': Fix Double.toString.
2011-01-12am f74c8a0e: resolved conflicts for merge of 4f7abf2a to honeycomb-plus-aosprepo sync
* commit 'f74c8a0e66b6869d3b3bb4a30bf2f089e350980e': Fix Double.toString.
2011-01-12resolved conflicts for merge of 4f7abf2a to honeycomb-plus-aosprepo sync
Change-Id: Ieaf43d93b158ab143601b874c872570c3c3fe98b
2011-01-12am 3c61f6c5: am fb641fa5: am c4379294: Remove @cts comments from hidden classes.Carl Shapiro
* commit '3c61f6c5fa99f7558f2b0386b0365b9430ed41fd': Remove @cts comments from hidden classes.
2011-01-12am fb641fa5: am c4379294: Remove @cts comments from hidden classes.Carl Shapiro
* commit 'fb641fa5146f95c7571c939616bdc11384319dc0': Remove @cts comments from hidden classes.
2011-01-12am c4379294: Remove @cts comments from hidden classes.Carl Shapiro
* commit 'c43792941691fd119cf9df8e5c2c1419f3f7b92d': Remove @cts comments from hidden classes.
2011-01-12Remove @cts comments from hidden classes.Carl Shapiro
Change-Id: I948fc13d0fc236b07dad5864cab2e5c4eba2c06c
2011-01-12am 5dd36eac: am e91e39db: am dcd012af: Merge "Improve java.util.Locale ↵Elliott Hughes
documentation." into honeycomb * commit '5dd36eacfe6d35174cbbaf3da4296c73fc2a776f': Improve java.util.Locale documentation.
2011-01-12am e91e39db: am dcd012af: Merge "Improve java.util.Locale documentation." ↵Elliott Hughes
into honeycomb * commit 'e91e39dbeed2cfd9dfec1ebf7caf11d90856669a': Improve java.util.Locale documentation.
2011-01-12am dcd012af: Merge "Improve java.util.Locale documentation." into honeycombElliott Hughes
* commit 'dcd012af04d58a1dc5cb5e9d23f424035617ab58': Improve java.util.Locale documentation.
2011-01-12Merge "Improve java.util.Locale documentation." into honeycombElliott Hughes
2011-01-12am bc307281: am 2ce1fb3e: am 55fa6d07: Merge "Remove the allocation limits ↵Carl Shapiro
interfaces." into honeycomb * commit 'bc307281679f1b9b6d223fd962c37a8160510125': Remove the allocation limits interfaces.
2011-01-12am 2ce1fb3e: am 55fa6d07: Merge "Remove the allocation limits interfaces." ↵Carl Shapiro
into honeycomb * commit '2ce1fb3e40dbb939280dd8058b084b5b7246cb7d': Remove the allocation limits interfaces.
2011-01-12am 55fa6d07: Merge "Remove the allocation limits interfaces." into honeycombCarl Shapiro
* commit '55fa6d07410842bb0510b261eceb35da227ecd3e': Remove the allocation limits interfaces.
2011-01-12Merge "Remove the allocation limits interfaces." into honeycombCarl Shapiro
2011-01-12Remove the allocation limits interfaces.Carl Shapiro
Change-Id: I85c3b48cb11823cfccd1901cac685d0c457a74b3
2011-01-12am 8b652b16: am 600f780e: am a8b58362: Merge "Fix bugs in toString() in ↵Jesse Wilson
reflection classes." into honeycomb * commit '8b652b16465e8d3e9afa681d2999febfe10a84b6': Fix bugs in toString() in reflection classes.
2011-01-12am 493136f5: am 9d219a88: am 28198687: Merge "Trivial test for ↵Dan Bornstein
DexClassLoader." into honeycomb * commit '493136f50d6407d118b3dc82e7a741b20dbaa0f9': Trivial test for DexClassLoader.
2011-01-12am 600f780e: am a8b58362: Merge "Fix bugs in toString() in reflection ↵Jesse Wilson
classes." into honeycomb * commit '600f780e27510687d5935e0b62759f1bfdc1b8e8': Fix bugs in toString() in reflection classes.
2011-01-12Improve java.util.Locale documentation.Elliott Hughes
The key change here is adding "honeycomb" to the table. The other changes are just targets of opportunity. I've also raised doclava bugs, because this page still looks awful after doclava's mangled it. (javadoc does a better job.) Change-Id: I5a8a9e7b2df8ec792f4d191729f8d30b8306cd6e
2011-01-12am 9d219a88: am 28198687: Merge "Trivial test for DexClassLoader." into ↵Dan Bornstein
honeycomb * commit '9d219a8896ca9d07b42a5333347a77d350ce54a8': Trivial test for DexClassLoader.
2011-01-12am a8b58362: Merge "Fix bugs in toString() in reflection classes." into ↵Jesse Wilson
honeycomb * commit 'a8b58362c8ee5aaca620854935a60b033b0733a1': Fix bugs in toString() in reflection classes.
2011-01-12am 28198687: Merge "Trivial test for DexClassLoader." into honeycombDan Bornstein
* commit '28198687d8d84aa9b3c1696860cb9cce861bf084': Trivial test for DexClassLoader.
2011-01-12Merge "Fix bugs in toString() in reflection classes." into honeycombJesse Wilson
2011-01-12Fix bugs in toString() in reflection classes.Jesse Wilson
Change-Id: Iceba152e1825eb859b23f9eb7463c4ed2e32bac9 http://b/3073292
2011-01-12Merge "Trivial test for DexClassLoader." into honeycombDan Bornstein
2011-01-12Trivial test for DexClassLoader.Dan Bornstein
To be expanded, soon! Change-Id: Iecdcc9ff8cc8560c7e3bd9720b2fbe9c1e9ed8a9
2011-01-12am 5de3dbf3: am 4d27e92d: am b3c7c0ab: Merge "Fix build and javadoc." into ↵Brad Fitzpatrick
honeycomb * commit '5de3dbf3fa0c9ef5789abfe8ffe0e53071ab893b': Fix build and javadoc.
2011-01-12am 4d27e92d: am b3c7c0ab: Merge "Fix build and javadoc." into honeycombBrad Fitzpatrick
* commit '4d27e92d7aaa2a6d771be7ff2695e46058b5d506': Fix build and javadoc.
2011-01-12am b3c7c0ab: Merge "Fix build and javadoc." into honeycombBrad Fitzpatrick
* commit 'b3c7c0abdb9ff5fe0ef78b0211a902cac6e2cfe4': Fix build and javadoc.
2011-01-12Merge "Fix build and javadoc." into honeycombBrad Fitzpatrick
2011-01-12Fix build and javadoc.Brad Fitzpatrick
Change-Id: Icf2d0372a74530ff0fae0c98488767b42f223281
2011-01-12am 2d71deb0: am 651d1905: am 79214492: Fix a droid doc error caused by the ↵Carl Shapiro
erroneous inflection of @return. * commit '2d71deb0336bf57ba74df1afe223c85e50ed5575': Fix a droid doc error caused by the erroneous inflection of @return.
2011-01-12am 651d1905: am 79214492: Fix a droid doc error caused by the erroneous ↵Carl Shapiro
inflection of @return. * commit '651d190516fddae25e525f40374f3d620d38bbbb': Fix a droid doc error caused by the erroneous inflection of @return.
2011-01-12am 79214492: Fix a droid doc error caused by the erroneous inflection of ↵Carl Shapiro
@return. * commit '7921449288479710fddfd9873ea6608b89ae271b': Fix a droid doc error caused by the erroneous inflection of @return.
2011-01-12Fix a droid doc error caused by the erroneous inflection of @return.Carl Shapiro
Change-Id: I61a3c8cc34d129a37c6556b9def5fa5fe0cafe46
2011-01-12am 706ea0b9: am 5e7fa214: am f6dbefb3: Merge "Remove method level hiding ↵Carl Shapiro
within hidden classes." into honeycomb * commit '706ea0b90e80b9f77b178d13f3a5c6b1cf434a35': Remove method level hiding within hidden classes.
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-05 01:44:47 +0000