| commit | f538bd6114a6bd72e4d65037532f6148f3174e1d | [log] [tgz] |
|---|---|---|
| author | Alan Viverette <alanv@google.com> | Thu Apr 21 21:33:50 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Apr 21 21:33:50 2016 +0000 |
| tree | a62a22803f5e1b2789da93440f850199c0e5b1c9 | |
| parent | ed276c145c962881bb6fc6d31a6eb2d418639370 [diff] | |
| parent | 83c401ba82de725a388d7087bf8b9c4350f843fc [diff] |
Merge "Don\'t overwrite vertical and horizontal offsets unless explicit" into nyc-dev am: e84393674d am: 37ab66ab37 am: 83c401ba82 * commit '83c401ba82de725a388d7087bf8b9c4350f843fc': Change-Id: Id8ab8849a538ca4ebacb4bdec8a97a9b840ffdd5