| commit | 38c94b68c77c9b91ce191d5ccfb718d9d8613eda | [log] [tgz] |
|---|---|---|
| author | Stephen Hines <srhines@google.com> | Thu Aug 23 14:11:26 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 23 14:11:26 2012 -0700 |
| tree | 3175052247d9fd9de0f1d4474b7ba9900b335625 | |
| parent | a03671cc3b17da7881cb0bfbc04df40d2839024d [diff] | |
| parent | d906a2af07a2683853848464da0b5fe77b13a0a7 [diff] |
am d906a2af: (-s ours) am 28464c41: Merge "Fix class redeclared as struct." * commit 'd906a2af07a2683853848464da0b5fe77b13a0a7': Fix class redeclared as struct.