tree af039a0706ce88db2acb55c38e16e2026d362763
parent cb2a5c1856d59cc153fe06d1fe1c62332fcd1e56
parent 0b8612bab4efdf821924694304dfefd0e4585274
author Nick Desaulniers <ndesaulniers@google.com> 1571432341 -0700
committer android-build-merger <android-build-merger@google.com> 1571432341 -0700

Merge "[frameworks][native][libs]{math|ui} fix -Wimplicit-int-float-conversion" am: c875ac80dc
am: 0b8612bab4

Change-Id: I07725712798dec67271f8e7f579a26200bd46719