OSDN Git Service

Merge "Don't overwrite vertical and horizontal offsets unless explicit" into nyc-dev
authorAlan Viverette <alanv@google.com>
Thu, 21 Apr 2016 21:21:33 +0000 (21:21 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 21 Apr 2016 21:21:35 +0000 (21:21 +0000)
commite84393674da0f5ecce2ee1074fc79c856f549623
tree13ecb5155740b10d47370b5dd4c1836a5c68c592
parent22d91b0eb40137e6236d7af5d2857df97648d15b
parentd7b2599285cf0affd6013a58497ff5fabdf41125
Merge "Don't overwrite vertical and horizontal offsets unless explicit" into nyc-dev