tree 998e83b44047d48430711b3a918905a2b04dd45b
parent 37128b6f709410763f85d112a1a3e6f9e42e1338
author Conley Owens <cco3@android.com> 1381867140 -0700
committer Conley Owens <cco3@android.com> 1381867140 -0700

Only check merge destination if it isn't None

Change-Id: Ifb1dcd07142933489e93a1f4f03e38289087b609