Merge "Fix conflict with common zsh alias" am: fd4a406174 am: 650771c5d4 am: 1c056cfbbc am: 43e387874c am: 42c26f9e0e

Original change: https://android-review.googlesource.com/c/platform/build/+/1434523

Change-Id: I992d3f2757850c10619415e4aaf8007302b8cbe0
This commit is contained in:
Treehugger Robot 2020-09-30 00:42:29 +00:00 committed by Automerger Merge Worker
commit 74432ab6ca

View file

@ -356,7 +356,7 @@ function should_add_completion() {
function addcompletions()
{
local T dir f
local f=
# Keep us from trying to run in something that's neither bash nor zsh.
if [ -z "$BASH_VERSION" -a -z "$ZSH_VERSION" ]; then