tree 760c06e93074b9fe225a1fbdfe1ebbcc2b8761cd
parent 9cf0a0bcfe067944839bf3015c6014d99573408b
author Vitaly Buka <vitalybuka@google.com> 1448313643 -0800
committer Vitaly Buka <vitalybuka@google.com> 1448313898 +0000

Fix invalid merge into master branch

Change-Id: Iaf2b741ef9ba66156b52bc0341738712b00e840f
Reviewed-on: https://weave-review.googlesource.com/1624
Reviewed-by: Vitaly Buka <vitalybuka@google.com>