tree 349c248467f8c1e7be24d9b41197bb66ea46a845
parent a7d9b93756c8b1e61a721fe14d941ee7ab975513
parent 4c963841db60ed59fd59a6fba79f8e3e6ec7f349
author Jinsuk Kim <jinsukkim@google.com> 1396489273 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396489273 +0000

am 4c963841: am b1dca162: Merge "Maintain display power status for playback device" into klp-modular-dev

* commit '4c963841db60ed59fd59a6fba79f8e3e6ec7f349':
  Maintain display power status for playback device