| commit | e8286cea0b4d1af7ca116c9198557937947448e8 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Thu Aug 27 14:41:58 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:41:58 2015 +0000 |
| tree | 23cc56c57eaae8cb3e9a9f81bdb7e881a5389b5f | |
| parent | 8d9e61fd1f235abffb435ea367e6a40260b53c96 [diff] | |
| parent | 1eb472a62322a4f82fa773a16c8bbbcff54bd465 [diff] |
am 1eb472a6: am 0653bb7d: (-s ours) am 60bbb93d: Merge "Simpleperf: Fix unused parameter" * commit '1eb472a62322a4f82fa773a16c8bbbcff54bd465':