tree a74cc7b7e34f9cfda70f4252ec56ce4fc8f1bfd6
parent f8a770a5159c84b3e8e26b2706a91d773cdd3971
parent 1a12311433a0ebce2d0c383ac886a257ae32e3d6
author Michael Wachenschwanz <mwachens@google.com> 1524252347 -0700
committer android-build-merger <android-build-merger@google.com> 1524252347 -0700

Merge "Fix fraction and dimension type in Resource.proto" into pi-dev
am: 1a12311433

Change-Id: I2463fab9dd5705a4af11fa17aebf0c23c7c12d07