tree 7bda8771435143f267bddf1d7e326164cc01db2d
parent fe6d855cf3239558f780f91ded6679f54cd47661
parent 7044ee162b730cb69e53aaa5e46500a1735a6b3e
author David Friedman <dmail@google.com> 1432333392 -0700
committer David Friedman <dmail@google.com> 1432333392 -0700

resolved conflicts for merge of 7044ee16 to mnc-preview-docs

Change-Id: Ia0d831660d7744f34c68dba62e19a11c83ec2ee7