| commit | 7a767eeb8c15f0ed7f9fbae2ee2aaafb91778289 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Sat Aug 16 20:24:13 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 16 20:24:13 2014 +0000 |
| tree | 225acea30efc9442421f376a7b29ff144e8a9408 | |
| parent | 4daaff6e835f8735138474cf28c67e1b9a7a97ab [diff] | |
| parent | e09170b5be3db27f6ec716ee029aba438d67992c [diff] |
am e09170b5: resolved conflicts for merge of 879f55ca to lmp-dev-plus-aosp * commit 'e09170b5be3db27f6ec716ee029aba438d67992c': Sync with upstream perf-3.12.