am: e84393674d
* commit 'e84393674da0f5ecce2ee1074fc79c856f549623':
Don't overwrite vertical and horizontal offsets unless explicit
Change-Id: I9cd87f63c07748ba4d53b1e8326900c1efeb04ee
am: e84393674d
* commit 'e84393674da0f5ecce2ee1074fc79c856f549623':
Don't overwrite vertical and horizontal offsets unless explicit
Change-Id: I9cd87f63c07748ba4d53b1e8326900c1efeb04ee