tree 5c42777d338704697cf57df16163309236e59798
parent 667a770068ce0c3713367cbec15fe5a515bef62f
parent 947c03eee4856351b70fbf2a2d4a9dac37f27991
author Michael Jurka <mikejurka@google.com> 1317233390 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1317233390 -0700

am 947c03ee: Merge "Moving power control in default layout" into ics-factoryrom

* commit '947c03eee4856351b70fbf2a2d4a9dac37f27991':
  Moving power control in default layout