diff options
| author | Anton Hansson <hansson@google.com> | 2021-02-23 14:35:11 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-02-23 14:35:11 +0000 |
| commit | 977d993125ca6faa0600778d849bd8633a877d67 (patch) | |
| tree | 43f4404c7028c1fa214c8579b4e418c1eb468232 /java/java.go | |
| parent | 7263dc47f42164beed66accda9d01d26e372ec3c (diff) | |
| parent | 76b232f2cce0ae21a16135f7d7abe5af42e46cb4 (diff) | |
Merge "Disallow using error-prone merge strategies" into mainline-prod
Diffstat (limited to 'java/java.go')
0 files changed, 0 insertions, 0 deletions