| commit | d1fb9143244dcb46b28a0edbae88f8f5815d31bf | [log] [tgz] |
|---|---|---|
| author | Alan Viverette <alanv@google.com> | Thu Apr 21 21:27:02 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Apr 21 21:27:02 2016 +0000 |
| tree | 1a102b52d5230e8c101b8039889510e56eec8eec | |
| parent | a51eb55a24c21d74e81619b988b17a39c85275cf [diff] | |
| parent | e84393674da0f5ecce2ee1074fc79c856f549623 [diff] |
Merge "Don\'t overwrite vertical and horizontal offsets unless explicit" into nyc-dev am: e84393674d * commit 'e84393674da0f5ecce2ee1074fc79c856f549623': Don't overwrite vertical and horizontal offsets unless explicit Change-Id: I9d68530848a578bcb015cbb586d777fc17b4c8ca