| commit | 83c401ba82de725a388d7087bf8b9c4350f843fc | [log] [tgz] |
|---|---|---|
| author | Alan Viverette <alanv@google.com> | Thu Apr 21 21:31:30 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Apr 21 21:31:30 2016 +0000 |
| tree | 060526203b7ba8c935a45b381b74c0ca7f5eb6b4 | |
| parent | 06f931e8eae92cbfb24983502d9cdf41f1284dad [diff] | |
| parent | 37ab66ab37b09fb56a5d9d9f809d956b78e637d6 [diff] |
Merge "Don\'t overwrite vertical and horizontal offsets unless explicit" into nyc-dev am: e84393674d am: 37ab66ab37 * commit '37ab66ab37b09fb56a5d9d9f809d956b78e637d6': Change-Id: I1fedad600d0b5598ecd91929cd9dc1212d504216