tree 5c42777d338704697cf57df16163309236e59798
parent 24cafbd773371edf7775d067fe58ba7b4a74b597
parent 5f09e62c80e6d50350cbc64c7500e7f6772a9848
author Michael Jurka <mikejurka@google.com> 1317235148 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1317235148 -0700

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

* commit '5f09e62c80e6d50350cbc64c7500e7f6772a9848':
  Moving power control in default layout