tree 6ab9bfd84f7f344bb69adfb60e5c5c017ac389d6
parent d1d0f3ed631d768ee5adc7765bf10a13444ade75
author matthewyuan <matthewyuan@google.com> 1433890901 -0700
committer matthewyuan <matthewyuan@google.com> 1433890901 -0700

Fix up manifest after branching refs/heads/stabilize-7155.B.

Change-Id: I38ee0521fa98fdbd5b6a547a6fa71d1301293f39