commit | af16330e37986b6ef35a8f0cc8aa56c7339d890b | [log] [tgz] |
---|---|---|
author | Alan Viverette <alanv@google.com> | Thu Apr 21 21:31:31 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Apr 21 21:31:31 2016 +0000 |
tree | c0697657d16342c565a8ba75ca1299b018fd5b5f | |
parent | 95ccbc9bbb12e8425f28e998727ca22cbab57a9c [diff] | |
parent | 0a80cd5cc075e4b4bbd8a3557234414b08bf21a7 [diff] |
Merge "Don\'t overwrite vertical and horizontal offsets unless explicit" into nyc-dev am: e84393674d am: d1fb914324 am: 0a80cd5cc0 * commit '0a80cd5cc075e4b4bbd8a3557234414b08bf21a7': Don't overwrite vertical and horizontal offsets unless explicit Change-Id: Icc50140af2be266f86586b3b78f1c08a5793030d