summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-7.1.1_r9' into cm-14.1cm-14.1_prerebaseDan Pasanen2017-01-070-0/+0
|\
| * merge in nyc-mr1-release history after reset to 704f3a3aea819128cc7e1e73b8a2a...gitbuildkicker2016-12-090-0/+0
| |\
| | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-12-080-0/+0
| |/|
| | * docs: Fixing bad unicode sequence in Javadocs.Andrew Solovay2016-12-012-4/+4
| |/
* | Merge tag 'android-7.1.1_r4' into cm-14.1Dan Pasanen2016-12-0514-1442/+1580
|\|
| * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-10-050-0/+0
| |\
| | * Add missing test change for Unicode 9 / emoji changeNeil Fuller2016-09-202-2/+6
| | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-09-180-0/+0
| | |\
| | | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-09-010-0/+0
| | | |\
| | | | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-08-230-0/+0
| | | | |\
| * | | | | Update timezone data to 2016g.Joachim Sauer2016-10-036-787/+793
| * | | | | Add missing test change for Unicode 9 / emoji changeNeil Fuller2016-09-202-2/+6
| |/ / / /
| * / / / Fix Unicode 9 Emoji LTR class.Joachim Sauer2016-09-1511-653/+781
| |/ / /
| * | | Merge "Changed Turkish translation for Cyprus, cts tests" into nyc-dev am: cc...Roozbeh Pournader2016-09-010-0/+0
| |\ \ \
| * \ \ \ Changed Turkish translation for Cyprus, cts tests am: 32157fee31Mihai Nita2016-09-010-0/+0
| |\ \ \ \
| * \ \ \ \ Merge "Changed Turkish translation for Cyprus, generated binaries" into nyc-d...Roozbeh Pournader2016-09-010-0/+0
| |\ \ \ \ \
| * \ \ \ \ \ Changed Turkish translation for Cyprus, generated binaries am: 08c953593dMihai Nita2016-09-010-0/+0
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Changed Turkish translation for Cyprus, source only am: 95b7682babMihai Nita2016-09-010-0/+0
| |\ \ \ \ \ \ \
| * | | | | | | | Changed Turkish translation for Cyprus, cts testsMihai Nita2016-08-311-0/+17
| * | | | | | | | Changed Turkish translation for Cyprus, generated binariesMihai Nita2016-08-312-0/+0
| * | | | | | | | Changed Turkish translation for Cyprus, source onlyMihai Nita2016-08-311-1/+1
| | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Fix race condition in ICU TimeZone.getDefault()Joachim Sauer2016-08-222-10/+22
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Fix deadlock between java.util and ICU TimeZone.Joachim Sauer2016-08-220-0/+0
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Fix deadlock between java.util and ICU TimeZone.Joachim Sauer2016-08-182-14/+34
* | | | | | | | | | Merge tag 'android-7.1.0_r4' of https://android.googlesource.com/platform/ext...Steve Kondik2016-10-252-18/+50
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ merge in nyc-dr1-release history after reset to nyc-dr1-devgitbuildkicker2016-09-010-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
| | * | | | | | | | | merge in nyc-dr1-release history after reset to nyc-dr1-devgitbuildkicker2016-08-220-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | |
| | | * | | | | | | | merge in nyc-dr1-release history after reset to nyc-dr1-devgitbuildkicker2016-08-210-0/+0
| | | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | |
| | | | * | | | | | | merge in nyc-dr1-release history after reset to nyc-mr1-devgitbuildkicker2016-07-150-0/+0
| | | | |\ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ merge in nyc-dr1-release history after reset to nyc-mr1-devThe Android Automerger2016-07-070-0/+0
| | | | | |\ \ \ \ \ \ \ | | | | | |/ / / / / / / | | | | |/| | | | | | |
| | | * / | | | | | | | Fix deadlock between java.util and ICU TimeZone.Joachim Sauer2016-08-192-14/+34
| | | |/ / / / / / / /
| * | | | | | | | | | Merge "Changed Turkish translation for Cyprus, cts tests" into nyc-devRoozbeh Pournader2016-09-010-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| | * | | | | | | | | Merge "Changed Turkish translation for Cyprus, cts tests" into nyc-devRoozbeh Pournader2016-09-011-0/+17
| | |\ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ Changed Turkish translation for Cyprus, cts testsMihai Nita2016-09-011-0/+17
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | / | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| | * | | | | | | | | Changed Turkish translation for Cyprus, cts testsMihai Nita2016-08-311-0/+17
| * | | | | | | | | | Merge "Changed Turkish translation for Cyprus, generated binaries" into nyc-devRoozbeh Pournader2016-09-010-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | / | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| | * | | | | | | | Merge "Changed Turkish translation for Cyprus, generated binaries" into nyc-devRoozbeh Pournader2016-09-012-0/+0
| | |\ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ Changed Turkish translation for Cyprus, generated binariesMihai Nita2016-09-012-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | / | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| | * | | | | | | | Changed Turkish translation for Cyprus, generated binariesMihai Nita2016-08-312-0/+0
| | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | Changed Turkish translation for Cyprus, source onlyMihai Nita2016-09-011-1/+1
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| / / / / / | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Changed Turkish translation for Cyprus, source onlyMihai Nita2016-08-311-1/+1
| | |/ / / / /
| * | | | | / Fix race condition in ICU TimeZone.getDefault()Joachim Sauer2016-08-222-10/+22
| | |_|_|_|/ | |/| | | |
| * | | | | Fix deadlock between java.util and ICU TimeZone.Joachim Sauer2016-08-192-14/+34
| | |_|_|/ | |/| | |
| * | | | Update timezone data to 2016f am: 5a10844836 am: 0488093f1c am: b5295f0fc3 -...Neil Fuller2016-07-070-0/+0
| |\| | | | | |/ / | |/| |
| | * | Update timezone data to 2016f am: 5a10844836 am: 0488093f1cNeil Fuller2016-07-070-0/+0
| | |\ \
| | | * \ Update timezone data to 2016f am: 5a10844836Neil Fuller2016-07-076-37/+30
| | | |\ \
| | | | * \ Update timezone data to 2016fNeil Fuller2016-07-076-37/+30
| | | | |\ \
| | | | | * | Update timezone data to 2016fNeil Fuller2016-07-066-37/+30
| * | | | | | Update timezone data to 2016fNeil Fuller2016-07-066-37/+30
| |\| | | | |
| | * | | | | Update timezone data to 2016fNeil Fuller2016-07-066-37/+30