tree 59aadb440684bbb1b7a01cebcd7530127dc8eff8
parent 01830d9498fd99d4dd94e8b13f1dc09f375be562
parent ecb7e4a77b0b7a39051d65dbe6ad3db99b562131
author Hans Boehm <hboehm@google.com> 1552432999 -0700
committer android-build-merger <android-build-merger@google.com> 1552432999 -0700

Merge "Correct registerNativeAllocation type" am: fe015a098c am: 90e8135f1e
am: ecb7e4a77b

Change-Id: I2ba5370ad1f6f3b8f0ad757c0993b5c399baaea7