tree ba0926bcbca04beb34c8fb08cfeb149deebcefac
parent f86d966bff8f2f8972af5847eee7fc3b0235e17f
parent cc99651a39f1740444cb6cd7d75c4422038c7b67
author Glenn Kasten <gkasten@google.com> 1444758306 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1444758306 +0000

am cc99651a: am cc3f2e8d: Merge "hal: Add support for perf lock management (continued)" into mnc-dr-dev

* commit 'cc99651a39f1740444cb6cd7d75c4422038c7b67':
  hal: Add support for perf lock management (continued)