tree bdcd89147e7126dc1c3195192035ddc7b2c7fc50
parent 193909da71a342519ad640d157c122a38b6d1a3e
author vandwalle <vandwalle@google.com> 1400694496 -0700
committer vandwalle <vandwalle@google.com> 1400694865 -0700

various autojoin fixes

Change-Id: I96acd02764a6fd7c8482ab82bd7e33280b90a577