tree 0e5aa66fa41816a5449f082c51bf02ff257a12cd
parent ad7c4f9c0fa569c4af1e32955cd9c88e0e4ff78e
parent 26f781db62e49e311009fc7a39155f72ab174d94
author Dan Zhang <danielzhang@google.com> 1529556378 -0700
committer android-build-merger <android-build-merger@google.com> 1529556378 -0700

Merge "Fix <UCP>[Power] toggled the power status" am: b3eeb859f7
am: 26f781db62

Change-Id: Id37f64d7f63a0ca86353fdee18379309e4359810