tree 8f458a21170d49474a5dc90b6076af693c0ea2b7
parent dbfd183fdc16660a66339edaa4c360c9f5615690
parent e9b5b7011442a20728c64704a6f35c2ddc3420c5
author Colin Cross <ccross@android.com> 1475526912 +0000
committer android-build-merger <android-build-merger@google.com> 1475526912 +0000

Merge "Fix struct vs. class mismatch in forward definitions" am: 8f1011d584 am: 6d0b466935 am: 95311818f0
am: e9b5b70114

Change-Id: I80205377a19c45927a11fc14ab72c13a7479570b