tree bc054e237717b3a3df31e29446b373d0fd27e3c0
parent e97a36ba2111729a7fb6ce25ed43ecddbcc5ca04
parent 4b579db11e38020f4d240f6488348953cba826d8
author Steven Moreland <smoreland@google.com> 1540943821 -0700
committer android-build-merger <android-build-merger@google.com> 1540943821 -0700

Merge "libbinder_ndk: recombine allocators/getters" am: f1a1b02592
am: 4b579db11e

Change-Id: Iee5c7d5cdbba6e2b4a78e7f3821fb2c4c56a5507