tree 82b2d6c3c5bc89d3d75352720a0084b72d5174bb
parent 1a58d2b9db3d66436e3004254bd39a47bb535e1a
parent 1a66f776473b78c62923f4bd761312abeca3a3e0
author Michael Wright <michaelwr@google.com> 1496233808 +0000
committer android-build-merger <android-build-merger@google.com> 1496233808 +0000

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

Change-Id: I9484e5763bf02e2236e40c538f0486288c3e45a4