tree f21bcef786197aa09dd7ce088fc6bf559d5affdc
parent 08aa3309790672ccc4c9b899fdf4e6162cfbc37a
parent c3f37589e04a52c109c63f6411db444500d4f92c
author Daniel Erat <derat@google.com> 1443648631 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443648631 +0000

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

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