tree e6c7831ae708e5e9b245af8daa07082fb8dd3ea6
parent 03c2ce530e468dd79c241f2792bd174512847f9f
parent dc27bde242c9585361446c1fa44a7b0791e69af7
author Nick Desaulniers <ndesaulniers@google.com> 1571073363 -0700
committer android-build-merger <android-build-merger@google.com> 1571073363 -0700

Merge "[frameworks][base][statsd] fix -Wimplicit-int-float-conversion" am: 8b178a6607 am: 4a3a9b4a9f am: 9c9a8c5642
am: dc27bde242

Change-Id: I2374b89a8124f588a9358ba43e0fc5dc3da5b8b6