tree 2b3f54f2d1875c4c3380fb4c8ca9565411764855
parent 3d3e2e2b1794bfed1a66e91ccec5da4e1cedef32
parent a7272b4cad0ef18db4a54b0999c60c92f405df8a
author Doris Liu <tianliu@google.com> 1468626984 +0000
committer android-build-merger <android-build-merger@google.com> 1468626984 +0000

Merge \"Ensure native allocation/free is correctly registered\" into nyc-mr1-dev
am: a7272b4cad

Change-Id: Ib1d07a6420d6800b290d0c47e9fcfe3690c541eb