Plain Diff
am: 99bbe2ff -s ours * commit '99bbe2ff': Add guest mode functionality (2/3) Change-Id: Ie493166a8d452f2892bb96323b23527efe053dd7