tree 1b5a02210563e96435ab1b0260fc0bd3356ae7bf
parent 41a4606b6e9868da9dac2e398de7999532ff4956
parent e6dac430873a0360761689b6e29bb6c1b91ca1db
author Jan Monsch <jpm@google.com> 1587737160 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1587737160 +0000

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

Change-Id: I523598eb40d7b97ea2eb169ae016b704ef90ae46