tree c2b7a88af9f4f965fd4466922782630552ae56b1
parent bd1285cfc9ae0f4f7d356607180ec03bd299c554
parent c14f23093e62ca75dae66d1b0918a72fb916b285
author Valerie Hau <vhau@google.com> 1567632862 -0700
committer android-build-merger <android-build-merger@google.com> 1567632862 -0700

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

Change-Id: Iec6e7552b3dd1dda332ac60724f1879930311206