tree d6093bcad572c7eacfe59592e179e933cd1271b9
parent b30866681475aff8fd23841dbadf1d39e0001e20
parent 43ea037b4c61e332d7419ac069a62e314166fdd7
author Chih-hung Hsieh <chh@google.com> 1416942237 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416942237 +0000

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

* commit '43ea037b4c61e332d7419ac069a62e314166fdd7':
  Fix class vs. struct mismatch