commit | 14506c880630958558e665c7b0d5d4d8ffd53ed1 | [log] [tgz] |
---|---|---|
author | Adrian Roos <roosa@google.com> | Tue Sep 05 15:39:17 2017 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Sep 05 15:39:17 2017 +0000 |
tree | fc4c06acb8aa1f3c6738f49cc8940d49f3243e6c | |
parent | 563a5637d71db27e0fc95082601198e29d80a15e [diff] | |
parent | c21891284b31b1372ee48b2f588850a5c482389e [diff] |
Merge "AOD Policy: Fix pausing timeout to use minutes instead of seconds" into oc-mr1-dev