summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2019-06-14 11:35:13 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-06-14 11:35:13 +0000
commit1a2f39cf609d9599e3484f77326ed6e5603815fc (patch)
treee2d3dd9578f4c4493487eece4ed30bf8c53a283f
parent247fb06baafa381f9d4090dd876ec32cbbf16d1e (diff)
parent3da4032a469054ac2a787c28757a6cad03082ae3 (diff)
downloadicu-1a2f39cf609d9599e3484f77326ed6e5603815fc.tar.gz
Merge changes from topic "am-b1abf59f1dd147ce9923691ecc3eba76" into oc-dev
* changes: [automerger skipped] DO NOT MERGE [CtsIcuTestCases] Old Android releases can optionally support the new Japanese era am: af2b3db4ad -s ours am: 93bc1a35a2 -s ours am skip reason: subject contains skip directive skipped: dbcd88db09 skipped: 8814e92683 skipped: 9aba3c8868 [automerger skipped] DO NOT MERGE [CtsIcuTestCases] Old Android releases can optionally support the new Japanese era am: af2b3db4ad -s ours am: 93bc1a35a2 -s ours am skip reason: subject contains skip directive skipped: dbcd88db09 skipped: 8814e92683 [automerger skipped] DO NOT MERGE [CtsIcuTestCases] Old Android releases can optionally support the new Japanese era am: af2b3db4ad -s ours am: 93bc1a35a2 -s ours am skip reason: subject contains skip directive skipped: dbcd88db09 [automerger skipped] DO NOT MERGE Cherry-pick: ICU-20536 Japanese era Reiwa support in ICU4J 56 am: 18c03b9631 -s ours am: b0ffb16c65 -s ours am skip reason: subject contains skip directive skipped: 9b609d5b07 skipped: 86b759a466 skipped: 3e86160446 [automerger skipped] DO NOT MERGE Cherry-pick: ICU-20536 Japanese era Reiwa support in ICU4J 56 am: 18c03b9631 -s ours am: b0ffb16c65 -s ours am skip reason: subject contains skip directive skipped: 9b609d5b07 skipped: 86b759a466 [automerger skipped] DO NOT MERGE Cherry-pick: ICU-20536 Japanese era Reiwa support in ICU4J 56 am: 18c03b9631 -s ours am: b0ffb16c65 -s ours am skip reason: subject contains skip directive skipped: 9b609d5b07 [automerger skipped] DO NOT MERGE Cherry-pick: ICU-20536 Japanese era Reiwa support in ICU4C 56 am: 1aa02d75f9 -s ours am: 220221d43d -s ours am skip reason: subject contains skip directive skipped: d629acccbf skipped: 4f2fefc067 skipped: 47a6cd0017 [automerger skipped] DO NOT MERGE Cherry-pick: ICU-20536 Japanese era Reiwa support in ICU4C 56 am: 1aa02d75f9 -s ours am: 220221d43d -s ours am skip reason: subject contains skip directive skipped: d629acccbf skipped: 4f2fefc067 [automerger skipped] DO NOT MERGE Cherry-pick: ICU-20536 Japanese era Reiwa support in ICU4C 56 am: 1aa02d75f9 -s ours am: 220221d43d -s ours am skip reason: subject contains skip directive skipped: d629acccbf [automerger skipped] DO NOT MERGE [CtsIcuTestCases] Old Android releases can optionally support the new Japanese era am: af2b3db4ad -s ours am: 93bc1a35a2 -s ours am skip reason: subject contains skip directive [automerger skipped] DO NOT MERGE Cherry-pick: ICU-20536 Japanese era Reiwa support in ICU4J 56 am: 18c03b9631 -s ours am: b0ffb16c65 -s ours am skip reason: subject contains skip directive [automerger skipped] DO NOT MERGE Cherry-pick: ICU-20536 Japanese era Reiwa support in ICU4C 56 am: 1aa02d75f9 -s ours am: 220221d43d -s ours am skip reason: subject contains skip directive
0 files changed, 0 insertions, 0 deletions