aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-07-08Merge "Fix build by removing external/icu4c from build."HEADmastermainElliott Hughes
2014-07-09Fix build by removing external/icu4c from build.Elliott Hughes
Change-Id: I24bc381dbc32d09d16354efdde80dc65df9741f1
2014-06-23Merge "Sort Latn after Kana and Hani."snapshots_masterElliott Hughes
2014-06-23Sort Latn after Kana and Hani.Elliott Hughes
Bug: 13790528 Change-Id: I96f631ad64406cb9e3afaa19864b39770380869f
2014-06-22Merge "Enable host multilib for ART testing."l-previewIan Rogers
2014-06-17Enable host multilib for ART testing.Ian Rogers
Change-Id: If852951c2ba08de2542e18c0205ee90b19ebbf8e
2014-06-12Merge "Upgrade icu4c to tzdata2014e."Elliott Hughes
2014-06-13Upgrade icu4c to tzdata2014e.Elliott Hughes
From the release notes: Changes affecting near-future time stamps Egypt's 2014 Ramadan-based transitions are June 26 and July 31 at 24:00. (Thanks to Imed Chihi.) Guess that from 2015 on Egypt will temporarily switch to standard time at 24:00 the last Thursday before Ramadan, and back to DST at 00:00 the first Friday after Ramadan. Similarly, Morocco's are June 28 at 03:00 and August 2 at 02:00. (Thanks to Milamber Space Network.) Guess that from 2015 on Morocco will temporarily switch to standard time at 03:00 the last Saturday before Ramadan, and back to DST at 02:00 the first Saturday after Ramadan. Changes affecting past time stamps The abbreviation "MSM" (Moscow Midsummer Time) is now used instead of "MSD" for Moscow's double daylight time in summer 1921. Also, a typo "VLASST" has been repaired to be "VLAST" for Vladivostok summer time in 1991. (Thanks to Hank W. for reporting the problems.) Change-Id: I4a6e359defa1f359dbf5f161519af2a10b1de484
2014-05-30am e7af79d8: Merge "Revert "Switch to libc++""Dan Albert
* commit 'e7af79d89d5c5d3dd7753e9421e11ea6fe7cb19f': Revert "Switch to libc++"
2014-05-30Merge "Revert "Switch to libc++""Dan Albert
2014-05-30Revert "Switch to libc++"Dan Albert
This reverts commit 216ae149fcbb6a5ecef884ddc6cc817caab2bbfa. Change-Id: Iffeb23fc1aeca5ac2ca4cf2f9273e0bfcb46c1c9
2014-05-30am a8b6e06f: Merge "Switch to libc++"Dan Albert
* commit 'a8b6e06ffdb59582cb3e8498b297b209f46ed33d': Switch to libc++
2014-05-30Merge "Switch to libc++"Dan Albert
2014-05-30am dd691bc7: Merge "Updates ICU collation with changes that will be in ICU ↵Elliott Hughes
54, taken from http://bugs.icu-project.org/trac/changeset/35762 and http://bugs.icu-project.org/trac/changeset/35766. This patch supports all collation-related keywords in Collator::createInsta * commit 'dd691bc7fd0295bf301f1c26fb5c8e9b57f32a50': Updates ICU collation with changes that will be in ICU 54, taken from http://bugs.icu-project.org/trac/changeset/35762 and http://bugs.icu-project.org/trac/changeset/35766. This patch supports all collation-related keywords in Collator::createInstance()
2014-05-30Merge "Updates ICU collation with changes that will be in ICU 54, taken from ↵Elliott Hughes
http://bugs.icu-project.org/trac/changeset/35762 and http://bugs.icu-project.org/trac/changeset/35766. This patch supports all collation-related keywords in Collator::createInstance()"
2014-05-29Updates ICU collation with changes that will be in ICU 54, taken fromccornelius
http://bugs.icu-project.org/trac/changeset/35762 and http://bugs.icu-project.org/trac/changeset/35766. This patch supports all collation-related keywords in Collator::createInstance() Change-Id: I7781e9ef2b556ff6e2b65b4559fe0c773ab4183b
2014-05-29Switch to libc++Dan Albert
Bug: 15193147 Change-Id: Ia51a4fdfdbae7377130a43c401c2d8d241671d1e
2014-05-29am 6b2f23f1: Merge "Upgrade icu4c to tzdata2014d."Elliott Hughes
* commit '6b2f23f11ecb2a3af71fa556206589f2cf413064': Upgrade icu4c to tzdata2014d.
2014-05-29Merge "Upgrade icu4c to tzdata2014d."Elliott Hughes
2014-05-28Upgrade icu4c to tzdata2014d.Elliott Hughes
Change-Id: If6f6d1d9abf11575287767d3d7dba3537a1a5674
2014-05-28am e2159217: Merge "Remove deprecated WITH_HOST_DALVIK."Ian Rogers
* commit 'e21592172d4bf87f14b1978c3557bf591d8d210d': Remove deprecated WITH_HOST_DALVIK.
2014-05-28Merge "Remove deprecated WITH_HOST_DALVIK."Ian Rogers
2014-05-23Remove deprecated WITH_HOST_DALVIK.Ian Rogers
Bug: 13751317 Change-Id: Ib460ffba3805335fece5f9eef417f1e3479f228a
2014-05-21am 29b5ff0d: Merge "Update ICU timezone data to 2014c"Neil Fuller
* commit '29b5ff0d40e5bafd7dfa41dc2fc38eb1c243f014': Update ICU timezone data to 2014c
2014-05-21Merge "Update ICU timezone data to 2014c"Neil Fuller
2014-05-21Update ICU timezone data to 2014cNeil Fuller
Reviewers: Please state if there are any other files that should be updated when these are changed. If so, the script in change I7efbd6f453fe2b3e71f564121ff0f64a74289d86 will need to be updated. This contains a change to test/cintltst/ccaltst.c, required by the data change and pointed out by mscherer. Change-Id: Ibf8a6f7805240c2ddd13aee02b4a058128a98e60
2014-05-20am ce277da0: Merge "Fix ICU tests"Neil Fuller
* commit 'ce277da069d9ec805ffd0c182b4ded4618565925': Fix ICU tests
2014-05-20Merge "Fix ICU tests"Neil Fuller
2014-05-20Fix ICU testsNeil Fuller
Fix ICU tests that were broken by change I04acd15c62d49c0cf30cc63f60db320bdb8e22e9 This commit removes test hacks that were put in when the data was changed to provide PST, CET, etc. as short names for certain timezones in the root locale. After this change there are still other android changes, For example, those related to forcing the gregorian calendar in certain locales. Change-Id: Ifc0fb88fe37032abc6611106a65cf281b0f9060c
2014-05-15am 8a78a97c: Merge "Removing data hacks from ICU root.txt"Neil Fuller
* commit '8a78a97c715df5bc0b35f6ff454c1180875a355b': Removing data hacks from ICU root.txt
2014-05-15Merge "Removing data hacks from ICU root.txt"Neil Fuller
2014-05-09Removing data hacks from ICU root.txtNeil Fuller
Previously, the standard ICU data was modified to support special short codes (e.g. PST, CET) in all locales within SimpleDateFormat.parse(). This commit moves the modification into Java code leaving the ICU data closer to upstream. This change is associated with a change in libcore: I9ae6397cf5335ef325aedb6472d0d66a6127e1dd Bug: 11413756 Change-Id: I04acd15c62d49c0cf30cc63f60db320bdb8e22e9
2014-05-07am ca96fee2: Merge "Don\'t factor out make variables that are only used once ↵Elliott Hughes
for the host." * commit 'ca96fee299d32bee36d0d35ab02df70c81301736': Don't factor out make variables that are only used once for the host.
2014-05-07Merge "Don't factor out make variables that are only used once for the host."Elliott Hughes
2014-05-07Don't factor out make variables that are only used once for the host.Elliott Hughes
Change-Id: I3a9ba9d3a30e6bf16afbe641524c86d1be6e29f8
2014-05-07am a456cc23: Merge "Remove unused LOCAL_LDLIBS."Ying Wang
* commit 'a456cc235b734a387a59ee9e1f92e435553631d2': Remove unused LOCAL_LDLIBS.
2014-05-07Merge "Remove unused LOCAL_LDLIBS."Ying Wang
2014-05-07Remove unused LOCAL_LDLIBS.Ying Wang
Change-Id: I98ed045ebf6e857cb74cbf99cf7477e5727611b6
2014-04-29Merge commit 'b90feb57ca1ce4b88b48e554ac1e228e72986b05' into HEADBill Yi
2014-04-21Merge "ICU4C updated to version 53, including new data and revised collation ↵idea133-weekly-releaseElliott Hughes
with better performance."
2014-04-16ICU4C updated to version 53, including new data and revised collation withccornelius
better performance. Change-Id: Iaaae4dbc04c4dc3751f1cc3c8d3b5dbdc708577f
2014-03-21resolved conflicts for merge of 18668f3b to klp-dev-plus-aospNarayan Kamath
2014-03-21Force icu4c to always default to the Gregorian calendar.android-4.4w_r1android-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_r1kitkat-wearkitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-devElliott Hughes
This matches the Java side of the system (and pre-KitKat behavior). Bug: 12004664 (cherry-picked from b844b3e14e24df5b8d9b25539f6eb92ac507d8b4) Change-Id: I2462e9a8af288535a1511f7cb3bba9dd459a8ed3
2014-03-14Merge "ICU52 update for Android."Narayan Kamath
2014-03-12ICU52 update for Android.ccornelius
- Adds zhuyin into .dat file for Chinese collation. - Fix several test failures. Change-Id: If0d7e7cd05d05a05687eb9ae9b0e30aa87e17dbf
2013-12-26Merge "Force icu4c to always default to the Gregorian calendar."Elliott Hughes
2013-12-21Force icu4c to always default to the Gregorian calendar.Elliott Hughes
This matches the Java side of the system (and pre-KitKat behavior). Bug: 12004664 Change-Id: I8591a872b42e75c983af447fc1f376adeb6d268a
2013-12-05Merge "Use "-include" to not fail apps_only build."idea133Ying Wang
2013-12-04Use "-include" to not fail apps_only build.Ying Wang
The conditional on TARGET_BUILD_APPS prevents us from doing pseudo apps_only build (i.e. "tapas <bundled modules>") in a full source tree. Change-Id: Iab8f50cbfb3c049b88968698b561608c1c059643
2013-11-26Merge "Omit platform shared lib target when building apps."Ulas Kirazci
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-26 16:10:18 +0000