| commit | 0a80cd5cc075e4b4bbd8a3557234414b08bf21a7 | [log] [tgz] |
|---|---|---|
| author | Alan Viverette <alanv@google.com> | Thu Apr 21 21:29:18 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Apr 21 21:29:18 2016 +0000 |
| tree | c25f0649cf38a15efad2619c864e19075e1ac5e3 | |
| parent | 01da0f89cf21ed9658f0bf56915e4e0917cf7443 [diff] | |
| parent | d1fb9143244dcb46b28a0edbae88f8f5815d31bf [diff] |
Merge "Don\'t overwrite vertical and horizontal offsets unless explicit" into nyc-dev am: e84393674d am: d1fb914324 * commit 'd1fb9143244dcb46b28a0edbae88f8f5815d31bf': Don't overwrite vertical and horizontal offsets unless explicit Change-Id: I0eca2b999be91c6c38df392ef62a4177ce20069f