tree 1b5a02210563e96435ab1b0260fc0bd3356ae7bf
parent 5d90093ea29566cacd783ac97a45cff6271a9289
parent e19e80af5e64bc27b609a96a3e355b7e4f89329a
author Jan Monsch <jpm@google.com> 1587738462 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1587738462 +0000

Fixed type mixing issue when building with bazel. am: e6dac43087 am: e19e80af5e

Change-Id: I701e0436120e52503381db9d1d7ded0068059d4a