tree 71f839be859238511b52c51b2f78ca513c2f056f
parent 478c17359804c2a4d95c19ad31b17ec27e33b44e
parent 6e575ccd0f88f16208fdde8a7ce9080b3cf87998
author Tom Cherry <tomcherry@google.com> 1492540389 +0000
committer android-build-merger <android-build-merger@google.com> 1492540389 +0000

Merge "init.rc: Remove sys.powerctl action" am: 9848209088 am: 9fcc7c8253
am: 6e575ccd0f

Change-Id: Iec1eb05ea5ec85c035d6ae7e232699ab3a6f6878