tree 225acea30efc9442421f376a7b29ff144e8a9408
parent 4daaff6e835f8735138474cf28c67e1b9a7a97ab
parent e09170b5be3db27f6ec716ee029aba438d67992c
author Elliott Hughes <enh@google.com> 1408220653 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408220653 +0000

am e09170b5: resolved conflicts for merge of 879f55ca to lmp-dev-plus-aosp

* commit 'e09170b5be3db27f6ec716ee029aba438d67992c':
  Sync with upstream perf-3.12.