| commit | 9043619069feccc6ae3dab98fbb9cfa9b488b925 | [log] [tgz] |
|---|---|---|
| author | Mathieu Chartier <mathieuc@google.com> | Mon May 12 17:37:27 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 12 17:37:27 2014 +0000 |
| tree | 211b74c90cff4fd8f523c7f0f598f909aa2e06d3 | |
| parent | dbec61c8862b9e6404f64226c7e3b289bbd7575e [diff] | |
| parent | b170b3e89e717c2d84a3ee7987f7460520fb9e17 [diff] |
am b170b3e8: Merge "Fix stub_test to pass with SS collector." * commit 'b170b3e89e717c2d84a3ee7987f7460520fb9e17': Fix stub_test to pass with SS collector.