tree 382798a81d542c1950e901b6b77c45c17b676498
parent 5633c1a476fbf6670e8347ce44cfba3d42b89bc4
parent 38c94b68c77c9b91ce191d5ccfb718d9d8613eda
author Stephen Hines <srhines@google.com> 1345756587 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1345756587 -0700

am 38c94b68: am d906a2af: (-s ours) am 28464c41: Merge "Fix class redeclared as struct."

* commit '38c94b68c77c9b91ce191d5ccfb718d9d8613eda':
  Fix class redeclared as struct.