tree 4f491b23958c4f19a4a839333da8af99eceb5243
parent ad23064d57bc8fba31d5e0df37a11dfdea392143
parent 3c29b116726a00634fceaf3b01d0013f924a35a1
author Valerie Hau <vhau@google.com> 1567633893 -0700
committer android-build-merger <android-build-merger@google.com> 1567633893 -0700

[automerger skipped] Restrict Automerge: Fix reinterpret_cast security bug am: c38310ff54 -s ours am: ced29d99a7 am: c14f23093e
am: 3c29b11672

Change-Id: I178ae33e7612f854dc338b23745dbb9b231eb957