tree e7e879ee2042d96cd2a72bb65537e8494f9d27fd
parent 85767df8cffd919d1ff0d78683424c5df370472a
parent 4dcb9b082b37a9bf6ae77b515aaff103b9d3e3a3
author Michael Wachenschwanz <mwachens@google.com> 1524253151 -0700
committer android-build-merger <android-build-merger@google.com> 1524253151 -0700

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

Change-Id: I5068164f7904d21b3de56be20c37092faac751be