| commit | 27631fabdecd17987757acdf1feaa347b5692a2c | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Tue Sep 05 16:17:05 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Sep 05 16:17:05 2017 +0000 |
| tree | 3d13e2b1529609319f64161a2c47c1fc6ea95c1b | |
| parent | dc168546df197e334338d328630fba4876a195b8 [diff] | |
| parent | 69ce71a11c67140aa7738bd51f86a4cb5225a4c9 [diff] |
Merge "AOD Policy: Fix pausing timeout to use minutes instead of seconds" into oc-mr1-dev am: 14506c8806 am: 69ce71a11c Change-Id: I81246205a12c9edb059a8a7926dfeef8e6a78125