tree a6a2057e69e40f15b8437a086b3fb9b49bfc4542
parent 3bc345f5719c0c20518eee69843d45653ff67d9b
parent 86a58cabe322b746ab0eb17f0cade34ed68ba60e
author Chih-hung Hsieh <chh@google.com> 1416254414 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1416254415 +0000

Merge "Fix struct vs. class mismatches"