| commit | fc9e2cf5539c928d979d3a2eb2ec4e9dd0ed902d | [log] [tgz] |
|---|---|---|
| author | Fredrik Roubert <roubert@google.com> | Wed Dec 06 18:18:02 2017 +0100 |
| committer | Fredrik Roubert <roubert@google.com> | Wed Dec 06 18:18:02 2017 +0100 |
| tree | 9fe94ec9898b055f8a0e4f26c1592fbb57991e46 | |
| parent | 8ec32397597ec0c6dc75d26a093111af73b3a925 [diff] | |
| parent | 05fa7802d0874812c234a29745586677ee5837ea [diff] |
Merge remote-tracking branch 'aosp/icu60' into aosp/master. This upgrades AOSP to ICU 60. Bug: 68208236 Test: ant check Test: make check Test: CtsIcuTestCases Test: CtsLibcoreOjTestCases Test: CtsLibcoreTestCases Change-Id: If8a83ba2892a80edf7a36f71104daee48889c763