tree be2d01e890d908ace99f7da284ea62121665b847
parent 76e172277a650f818b10ec1fc586ca40f18cf149
parent 949ce9c1daa2aec83ad4d90d42d2d449141886eb
author Alex Light <allight@google.com> 1473458197 +0000
committer android-build-merger <android-build-merger@google.com> 1473458197 +0000

Merge "Fix vtable corruption issue" into nyc-mr1-dev
am: 949ce9c1da

Change-Id: Ic5fc1c6cd47d3620676a5fb4357f09f4727087b9