tree f275474a82524a1c5d77ec67a1a4ab36bfd32bfe
parent 27805ce0b18086a2349bd7c492b6ef5f45216ce4
parent 14506c880630958558e665c7b0d5d4d8ffd53ed1
author Adrian Roos <roosa@google.com> 1504627156 +0000
committer android-build-merger <android-build-merger@google.com> 1504627156 +0000

Merge "AOD Policy: Fix pausing timeout to use minutes instead of seconds" into oc-mr1-dev
am: 14506c8806

Change-Id: Ia7c5e551741107b04b4214a4a5e33fe982a68941