| commit | 140326584f6ec32a744d1dbc7779d87ca2c0816a | [log] [tgz] |
|---|---|---|
| author | Stephen Hines <srhines@google.com> | Thu Aug 23 14:16:27 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 23 14:16:27 2012 -0700 |
| tree | 382798a81d542c1950e901b6b77c45c17b676498 | |
| parent | 5633c1a476fbf6670e8347ce44cfba3d42b89bc4 [diff] | |
| parent | 38c94b68c77c9b91ce191d5ccfb718d9d8613eda [diff] |
am 38c94b68: am d906a2af: (-s ours) am 28464c41: Merge "Fix class redeclared as struct." * commit '38c94b68c77c9b91ce191d5ccfb718d9d8613eda': Fix class redeclared as struct.