tree 6ec5ab15b8027e57dc8a34c5eae3bca0a418f185
parent 8c293fecaa4949f81509f99d0457e5f68eb20869
parent faecafce62ca39a7693669f7c9eabf2d71c633cf
author Amith Yamasani <yamasani@google.com> 1402088272 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402088272 +0000

am 87590b53: Merge "Add missing abstract method override in BridgePowerManager." into lmp-preview-dev

* commit '87590b5342c5c4b1fb7b1c6037d64cffd1806025':
  Add missing abstract method override in BridgePowerManager.