tree 0c5f05adf074f646239d6d750d34c62cbf5bcf0a
parent cf34ce8e22161b0d1ba8d97c00ae460d012f0356
parent f0e8744620cc95464dcb7622f3582d70cb7bc364
author Daniel Erat <derat@google.com> 1443650094 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443650094 +0000

am f0e87446: am d3e3d889: am c3f37589: Merge "Update instructions in IPowerManager.aidl."

* commit 'f0e8744620cc95464dcb7622f3582d70cb7bc364':
  Update instructions in IPowerManager.aidl.