tree 55aec08679c2874d12e02933338ce34554d7a15b
parent 38a22ce6d4039b9a98669d16888e00e5a4daa75e
author Chris Craik <ccraik@google.com> 1461777184 -0700
committer Chris Craik <ccraik@google.com> 1461867581 -0700

Fix incorrect merge resolution

bug:27252154
Change-Id: Ic471e2180870ac30fe8fdbec7da140e6fbe314b7