tree d477280d832d44bb2962eef2ebc06e7335a72817
parent eb9542bdd7f555a34290d82b7c9b1fb821302a1b
parent 0b6b756f3d798c8eac878a4c0aece952d09cf572
author Nick Desaulniers <ndesaulniers@google.com> 1571201295 -0700
committer android-build-merger <android-build-merger@google.com> 1571201295 -0700

Merge "[frameworks][base][hwui] fix -Wimplicit-int-float-conversion" am: f7cf0dfa55
am: 0b6b756f3d

Change-Id: I2f28cd59087aff7726c1dab79ceaeb15e5edd6c9