tree bf2625aea2c2abdc5a83e8692b8d90d1a33a0337
parent 11a2bcad064cf3e80491acc5bb12f70fbc1a20ad
parent 1d6c149d891c8dbfef78cd56a2d7fc6269348875
author Colin Cross <ccross@android.com> 1475257235 +0000
committer android-build-merger <android-build-merger@google.com> 1475257235 +0000

Merge "Fix struct vs. class mismatch in forward definitions"
am: 1d6c149d89

Change-Id: Iba83f822a72416e0b63b796f16065e8a672d66d9