tree 14233c90399e45c1f6dfc4aebd75d3b117384948
parent 6cc39a475dd8eaac04438b393559612ff7cd840f
parent 481c4b641ea7d210396f16478c486cabf51db879
author Chih-hung Hsieh <chh@google.com> 1416875063 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416875063 +0000

am 481c4b64: Merge "Fix class vs. struct mismatch"

* commit '481c4b641ea7d210396f16478c486cabf51db879':
  Fix class vs. struct mismatch