summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Ferris <bferris@google.com>2019-01-09 16:04:26 -0800
committerBryan Ferris <bferris@google.com>2019-01-10 00:11:10 +0000
commitdd8b0a6bc82555fd2f74c307e2eae9974ad5b152 (patch)
tree3d1e259e324792130b415a983436cf56343a4a63
parent79c23760450bb94a0c9369c0a7c32d63319c6a0e (diff)
downloadbase-dd8b0a6bc82555fd2f74c307e2eae9974ad5b152.tar.gz
Empty commit for automerge manipulation
The backport for nyc-dev through oc-dev in b/118694079 was improperly applied. Therefore, we need to apply changes to oc-dev but not oc-mr1-dev. Since the different CL's had the same Change ID we cannot use MERGED IN with the original Change ID, and RESTRICT AUTOMERGE can't stop us from jumping to oc-mr1-dev. This commit gives us a Change ID that we can use for proper behavior. Test: No code or configuration changes were made in this CL Bug: 118694079 Change-Id: Idab3ecc246fe9344a09e6907a0ba39f8ea6506f9
0 files changed, 0 insertions, 0 deletions