tree d3c65a8bb0c423f5aea3d12f861c76f687b0b113
parent 70dd7db6a1afdb8a3a9902d818d679d83099463e
parent 614636e9263c0d87c8c738dccf298bd16c5fec75
author Michael Wright <michaelwr@google.com> 1496233359 +0000
committer android-build-merger <android-build-merger@google.com> 1496233359 +0000

Merge "Change the thread for handling shutdown of PowerManagerService." into oc-dev
am: 614636e926

Change-Id: If95c56ec0f9d1e03c8d57ae8fda81ba2696b7405