tree dfdbe807054c5727c720d515bd749209dcdbae83
parent 918d3fef695f0f7c45931148d3ad50686f514a75
parent 4d384aa34eed6916656bb351b3a8adf1ec9e1337
author Jorim Jaggi <jjaggi@google.com> 1491937168 +0000
committer android-build-merger <android-build-merger@google.com> 1491937168 +0000

Merge "Revert "Revert "Handle case when snapshot dimensions don't match""" into oc-dev am: 971fe468a4
am: 4d384aa34e

Change-Id: Ia4c5959b59e6a76908fbacbcd9768f9836437719