Jorim Jaggi 4d384aa34e Merge "Revert "Revert "Handle case when snapshot dimensions don't match""" into oc-dev ...

am: 971fe468a4

Change-Id: Id22f93bb9250f587c678a401fa57507784a58ebc

2017-04-11 18:30:18 +00:00

..

android

Merge "Revert "Revert "Handle case when snapshot dimensions don't match""" into oc-dev

2017-04-11 18:30:18 +00:00

google/android

…