OSDN Git Service

Merge "Fix struct vs. class mismatch in forward definitions" am: 8f1011d584 am: 6d0b4...
authorColin Cross <ccross@android.com>
Mon, 3 Oct 2016 20:32:01 +0000 (20:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 3 Oct 2016 20:32:01 +0000 (20:32 +0000)
am: 95311818f0

Change-Id: I45b57d37d08699afc070699d07485cb83c51850a


Trivial merge