OSDN Git Service

Merge "Fix fraction and dimension type in Resource.proto" into pi-dev
authorMichael Wachenschwanz <mwachens@google.com>
Fri, 20 Apr 2018 19:25:47 +0000 (12:25 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Apr 2018 19:25:47 +0000 (12:25 -0700)
commit4dcb9b082b37a9bf6ae77b515aaff103b9d3e3a3
treea74cc7b7e34f9cfda70f4252ec56ce4fc8f1bfd6
parentf8a770a5159c84b3e8e26b2706a91d773cdd3971
parent1a12311433a0ebce2d0c383ac886a257ae32e3d6
Merge "Fix fraction and dimension type in Resource.proto" into pi-dev
am: 1a12311433

Change-Id: I2463fab9dd5705a4af11fa17aebf0c23c7c12d07