tree 0fe50909512e9b9bafd991c60cff390f37f72a6e
parent d43ccf6ac42a9f7b36fa9d5e6fee90b083152ef6
parent 5d29677e179e7accce4924ccd957d7c74de0ddfb
author Stephen Hines <srhines@google.com> 1345669824 -0700
committer android code review <noreply-gerritcodereview@google.com> 1345669824 -0700

Merge "Fix class redeclared as struct."