kc3-lang/angle

2020-04-09T12:18:02

Remove the merge command from roll_aosp.sh There are two issues doing the merge in the script: - This command makes the merge specific to an AOSP branch - It uses the version of roll_aosp that is from the previous roll instead of the ToT version. BUG=b:150892231 Change-Id: I579484092ca3d8c5e0e2d4d4bd1272eaeccc9da3 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2152667 Reviewed-by: Tim Van Patten <timvp@google.com> Commit-Queue: Geoff Lang <geofflang@chromium.org>