tree 6e9ade86e63d9dea0e8c327c24c426192ad8ddc6
parent 2ef0bdafc104da56a896f9de2ddde6f3d6c918cc
parent 11a2bcad064cf3e80491acc5bb12f70fbc1a20ad
author Colin Cross <ccross@android.com> 1475192801 +0000
committer android-build-merger <android-build-merger@google.com> 1475192801 +0000

Merge "Fix weak vtable warnings" am: d93a40c920
am: 11a2bcad06

Change-Id: I1fd134d6eedb2f324de36b8e066b7d942fccd2eb