tree adfb3222fbc39842007319284c0f2a4400faea52
parent d981ee95f46b51d49841c86cf762f80bd31f16e0
parent 62444d495005637c89b867163a06e57a5bc47107
author Dan Gittik <dangittik@google.com> 1523640075 -0700
committer android-build-merger <android-build-merger@google.com> 1523640075 -0700

Merge "Fixed power manager CTS test." into pi-dev
am: 62444d4950

Change-Id: I96d0acccf64a86a241178241dc6fc9b069f29ac8