tree 2f0c15d34aa5a20f120b4107ef66ac6cfd9c8dde
parent c3ea7e39e51beeac824e3a204e0b5486dca38e91
parent 00de5c9f04e42045bd0299c06a9cc05187b1dff0
author Filip Gruszczynski <gruszczy@google.com> 1423181375 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423181375 +0000

am 00de5c9f: Merge "Add hidden shutdown method to PowerManager." into lmp-mr1-modular-dev

* commit '00de5c9f04e42045bd0299c06a9cc05187b1dff0':
  Add hidden shutdown method to PowerManager.